Update parsers

Currently translated at 100.0% (648 of 648 strings)

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

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
     - name: ⚠️ Source issue
       url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new
-      about: If you have troubles with a manga parser or want to propose new manga source, please open an issue in the kotatsu-parsers repository instead
+      about: If you have a problem with a specific **manga source** or want to propose a new one, please open an issue in the kotatsu-parsers repository instead

.github/ISSUE_TEMPLATE/report_bug.yml

@@ -60,7 +60,7 @@ body:
       attributes:
           label: Acknowledgements
           options:
-              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
                 required: true
-              - label: If this is an issue with a parser, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
+              - label: This is not an issue with a specific manga source. Otherwise, you have to open an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
                 required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -20,5 +20,5 @@ body:
           label: Acknowledgements
           description: Read this carefully, we will close and ignore your issue if you skimmed through this.
           options:
-              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                required: true
+              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
+                required: true

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 643
-		versionName = '7.1'
+		versionCode = 648
+		versionName = '7.2'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,7 +82,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:d218ad5a67') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:56fd22b43f') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -90,14 +90,15 @@ dependencies {
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.24'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
 
-	implementation 'androidx.appcompat:appcompat:1.6.1'
+	implementation 'androidx.appcompat:appcompat:1.7.0'
 	implementation 'androidx.core:core-ktx:1.13.1'
 	implementation 'androidx.activity:activity-ktx:1.9.0'
 	implementation 'androidx.fragment:fragment-ktx:1.7.1'
+	implementation 'androidx.transition:transition-ktx:1.5.0'
 	implementation 'androidx.collection:collection-ktx:1.4.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.8.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.8.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1'
+	implementation 'androidx.lifecycle:lifecycle-service:2.8.1'
+	implementation 'androidx.lifecycle:lifecycle-process:2.8.1'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -105,7 +106,7 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.12.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.1'
 	implementation 'androidx.webkit:webkit:1.11.0'
 
 	implementation 'androidx.work:work-runtime:2.9.0'

app/src/debug/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.settings
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+import leakcanary.LeakCanary
+import org.koitharu.kotatsu.R
+import org.koitharu.workinspector.WorkInspector
+
+class SettingsMenuProvider(
+	private val context: Context,
+) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_settings, menu)
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+		R.id.action_leaks -> {
+			context.startActivity(LeakCanary.newLeakDisplayActivityIntent())
+			true
+		}
+
+		R.id.action_works -> {
+			context.startActivity(WorkInspector.getIntent(context))
+			true
+		}
+
+		else -> false
+	}
+}

app/src/debug/res/menu/opt_settings.xml

@@ -8,14 +8,9 @@
 		android:title="@string/leak_canary_display_activity_label"
 		app:showAsAction="never" />
 
-	<item
-		android:id="@id/action_tracker"
-		android:title="@string/check_for_new_chapters"
-		app:showAsAction="never" />
-
 	<item
 		android:id="@id/action_works"
-		android:title="Works"
+		android:title="@string/wi_lib_name"
 		app:showAsAction="never" />
 
 </menu>

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/MigrateUseCase.kt

@@ -69,6 +69,7 @@ class MigrateUseCase @Inject constructor(
 					lastCheckTime = System.currentTimeMillis(),
 					lastChapterDate = lastChapter?.uploadDate ?: 0L,
 					lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
+					lastError = null,
 				)
 				tracksDao.delete(oldDetails.id)
 				tracksDao.upsert(newTrack)

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

@@ -108,8 +108,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onDestroy() {
 		super.onDestroy()
-		viewBinding.webView.stopLoading()
-		viewBinding.webView.destroy()
+		if (hasViewBinding()) {
+			viewBinding.webView.stopLoading()
+			viewBinding.webView.destroy()
+		}
 	}
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {

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

@@ -48,6 +48,7 @@ import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.main.domain.CoverRestoreInterceptor
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
@@ -152,10 +153,12 @@ interface AppModule {
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
 			acraScreenLogger: AcraScreenLogger,
+			screenshotPolicyHelper: ScreenshotPolicyHelper,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
 			acraScreenLogger,
+			screenshotPolicyHelper,
 		)
 
 		@Provides

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

@@ -84,6 +84,7 @@ class JsonDeserializer(private val json: JSONObject) {
 		source = json.getString("source"),
 		isEnabled = json.getBoolean("enabled"),
 		sortKey = json.getInt("sort_key"),
+		addedIn = json.getIntOrDefault("added_in", 0),
 	)
 
 	fun toMap(): Map<String, Any?> {

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

@@ -33,6 +33,7 @@ import org.koitharu.kotatsu.core.db.migrations.Migration17To18
 import org.koitharu.kotatsu.core.db.migrations.Migration18To19
 import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
+import org.koitharu.kotatsu.core.db.migrations.Migration20To21
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -58,7 +59,7 @@ import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 20
+const val DATABASE_VERSION = 21
 
 @Database(
 	entities = [
@@ -118,6 +119,7 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration17To18(),
 	Migration18To19(),
 	Migration19To20(),
+	Migration20To21(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaSourcesDao.kt

@@ -11,6 +11,7 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.intellij.lang.annotations.Language
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 
@@ -23,6 +24,9 @@ abstract class MangaSourcesDao {
 	@Query("SELECT source FROM sources WHERE enabled = 1")
 	abstract suspend fun findAllEnabledNames(): List<String>
 
+	@Query("SELECT * FROM sources WHERE added_in >= :version")
+	abstract suspend fun findAllFromVersion(version: Int): List<MangaSourceEntity>
+
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
@@ -68,6 +72,7 @@ abstract class MangaSourcesDao {
 				source = source,
 				isEnabled = isEnabled,
 				sortKey = getMaxSortKey() + 1,
+				addedIn = BuildConfig.VERSION_CODE,
 			)
 			upsert(entity)
 		}

app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaSourceEntity.kt

@@ -14,4 +14,5 @@ data class MangaSourceEntity(
 	val source: String,
 	@ColumnInfo(name = "enabled") val isEnabled: Boolean,
 	@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
+	@ColumnInfo(name = "added_in") val addedIn: Int,
 )

app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration20To21.kt

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration20To21 : Migration(20, 21) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE tracks ADD COLUMN `last_error` TEXT DEFAULT NULL")
+		db.execSQL("ALTER TABLE sources ADD COLUMN `added_in` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -15,8 +15,6 @@ import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.toTitleCase
-import java.util.Locale
 import com.google.android.material.R as materialR
 
 fun MangaSource(name: String): MangaSource {
@@ -39,7 +37,7 @@ val ContentType.titleResId
 
 fun MangaSource.getSummary(context: Context): String {
 	val type = context.getString(contentType.titleResId)
-	val locale = locale?.toLocale().getDisplayName(context)
+	val locale = locale.toLocale().getDisplayName(context)
 	return context.getString(R.string.source_summary_pattern, type, locale)
 }
 

app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt

@@ -4,8 +4,10 @@ import android.util.Log
 import dagger.Lazy
 import okhttp3.Headers
 import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
 import okhttp3.Request
 import okhttp3.Response
+import okio.IOException
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -13,6 +15,7 @@ import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mergeWith
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.net.IDN
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -23,7 +26,7 @@ class CommonHeadersInterceptor @Inject constructor(
 	private val mangaLoaderContextLazy: Lazy<MangaLoaderContextImpl>,
 ) : Interceptor {
 
-	override fun intercept(chain: Interceptor.Chain): Response {
+	override fun intercept(chain: Chain): Response {
 		val request = chain.request()
 		val source = request.tag(MangaSource::class.java)
 		val repository = if (source != null) {
@@ -46,7 +49,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			headersBuilder.trySet(CommonHeaders.REFERER, "https://$idn/")
 		}
 		val newRequest = request.newBuilder().headers(headersBuilder.build()).build()
-		return repository?.intercept(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
+		return repository?.interceptSafe(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
 	}
 
 	private fun Headers.Builder.trySet(name: String, value: String) = try {
@@ -55,10 +58,21 @@ class CommonHeadersInterceptor @Inject constructor(
 		e.printStackTraceDebug()
 	}
 
+	private fun Interceptor.interceptSafe(chain: Chain): Response = runCatchingCancellable {
+		intercept(chain)
+	}.getOrElse { e ->
+		if (e is IOException) {
+			throw e
+		} else {
+			// only IOException can be safely thrown from an Interceptor
+			throw IOException("Error in interceptor: ${e.message}", e)
+		}
+	}
+
 	private class ProxyChain(
-		private val delegate: Interceptor.Chain,
+		private val delegate: Chain,
 		private val request: Request,
-	) : Interceptor.Chain by delegate {
+	) : Chain by delegate {
 
 		override fun request(): Request = request
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/network/DoHManager.kt

@@ -85,7 +85,7 @@ class DoHManager(
 			).build()
 
 		DoHProvider.ZERO_MS -> DnsOverHttps.Builder().client(bootstrapClient)
-			.url("https://0ms.dev/dns-query".toHttpUrl())
+			.url("https://2ca4h4crra.cloudflare-gateway.com/dns-query".toHttpUrl())
 			.resolvePublicAddresses(true)
 			.build()
 	}

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

@@ -290,17 +290,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_SOURCES_GRID, true)
 		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
 
-	val isNewSourcesTipEnabled: Boolean
-		get() = prefs.getBoolean(KEY_SOURCES_NEW, true)
+	var sourcesVersion: Int
+		get() = prefs.getInt(KEY_SOURCES_VERSION, 0)
+		set(value) = prefs.edit { putInt(KEY_SOURCES_VERSION, value) }
 
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
 	val screenshotsPolicy: ScreenshotsPolicy
-		get() = runCatching {
-			val key = prefs.getString(KEY_SCREENSHOTS_POLICY, null)?.uppercase(Locale.ROOT)
-			if (key == null) ScreenshotsPolicy.ALLOW else ScreenshotsPolicy.valueOf(key)
-		}.getOrDefault(ScreenshotsPolicy.ALLOW)
+		get() = prefs.getEnumValue(KEY_SCREENSHOTS_POLICY, ScreenshotsPolicy.ALLOW)
 
 	var userSpecifiedMangaDirectories: Set<File>
 		get() {
@@ -653,7 +651,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_APP_LOCALE = "app_locale"
 		const val KEY_LOGGING_ENABLED = "logging"
 		const val KEY_SOURCES_GRID = "sources_grid"
-		const val KEY_SOURCES_NEW = "sources_new"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
 		const val KEY_TIPS_CLOSED = "tips_closed"
 		const val KEY_SSL_BYPASS = "ssl_bypass"
@@ -689,6 +686,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_STATS_ENABLED = "stats_on"
 		const val KEY_FEED_HEADER = "feed_header"
 		const val KEY_SEARCH_SUGGESTION_TYPES = "search_suggest_types"
+		const val KEY_SOURCES_VERSION = "sources_version"
 
 		// keys for non-persistent preferences
 		const val KEY_APP_VERSION = "app_version"

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ScreenshotsPolicy.kt

@@ -3,5 +3,5 @@ package org.koitharu.kotatsu.core.prefs
 enum class ScreenshotsPolicy {
 
 	// Do not rename this
-	ALLOW, BLOCK_NSFW, BLOCK_ALL;
-}
+	ALLOW, BLOCK_NSFW, BLOCK_INCOGNITO, BLOCK_ALL;
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.ui
 import android.content.Intent
 import android.content.res.Configuration
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -18,6 +19,8 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
@@ -25,10 +28,12 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 
 @Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
+	ScreenshotPolicyHelper.ContentContainer,
 	WindowInsetsDelegate.WindowInsetsListener {
 
 	private var isAmoledTheme = false
@@ -92,10 +97,20 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	override fun onSupportNavigateUp(): Boolean {
-		if (supportFragmentManager.popBackStackImmediate()) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+			// TODO fix behavior on Android 14
+			dispatchNavigateUp()
+			return true
+		}
+		val fm = supportFragmentManager
+		if (fm.isStateSaved) {
 			return false
 		}
-		dispatchNavigateUp()
+		if (fm.backStackEntryCount > 0) {
+			fm.popBackStack()
+		} else {
+			dispatchNavigateUp()
+		}
 		return true
 	}
 
@@ -140,6 +155,8 @@ abstract class BaseActivity<B : ViewBinding> :
 		}
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = flowOf(false)
+
 	private fun putDataToExtras(intent: Intent?) {
 		intent?.putExtra(EXTRA_DATA, intent.data)
 	}
@@ -159,6 +176,8 @@ abstract class BaseActivity<B : ViewBinding> :
 		}
 	}
 
+	protected fun hasViewBinding() = ::viewBinding.isInitialized
+
 	@EntryPoint
 	@InstallIn(SingletonComponent::class)
 	interface BaseActivityEntryPoint {

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt

@@ -63,7 +63,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 		)
 	}
 
-	protected fun setTitle(title: CharSequence?) {
+	protected open fun setTitle(title: CharSequence?) {
 		(activity as? SettingsActivity)?.setSectionTitle(title)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScrollRecyclerView.kt

@@ -52,6 +52,16 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 		fastScroller.visibility = if (isFastScrollerEnabled) visibility else GONE
 	}
 
+	override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
+		super.setPadding(left, top, right, bottom)
+		fastScroller.setPadding(left, top, right, bottom)
+	}
+
+	override fun setPaddingRelative(start: Int, top: Int, end: Int, bottom: Int) {
+		super.setPaddingRelative(start, top, end, bottom)
+		fastScroller.setPaddingRelative(start, top, end, bottom)
+	}
+
 	override fun onAttachedToWindow() {
 		super.onAttachedToWindow()
 		fastScroller.attachRecyclerView(this)

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/sheet/BottomSheetCollapseCallback.kt

@@ -1,22 +1,34 @@
 package org.koitharu.kotatsu.core.ui.sheet
 
+import android.annotation.SuppressLint
 import android.view.View
+import android.view.ViewGroup
+import androidx.activity.BackEventCompat
 import androidx.activity.OnBackPressedCallback
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
 
 class BottomSheetCollapseCallback(
-	private val behavior: BottomSheetBehavior<*>,
-) : OnBackPressedCallback(behavior.state == STATE_EXPANDED) {
+	private val sheet: ViewGroup,
+	private val behavior: BottomSheetBehavior<*> = BottomSheetBehavior.from(sheet),
+) : OnBackPressedCallback(behavior.state == STATE_EXPANDED || behavior.state == STATE_HALF_EXPANDED) {
 
 	init {
 		behavior.addBottomSheetCallback(
 			object : BottomSheetBehavior.BottomSheetCallback() {
 
+				@SuppressLint("SwitchIntDef")
 				override fun onStateChanged(view: View, state: Int) {
-					isEnabled = state == STATE_EXPANDED || state == STATE_HALF_EXPANDED
+					when (state) {
+						STATE_EXPANDED,
+						STATE_HALF_EXPANDED -> isEnabled = true
+
+						STATE_COLLAPSED,
+						STATE_HIDDEN -> isEnabled = false
+					}
 				}
 
 				override fun onSlide(p0: View, p1: Float) = Unit
@@ -24,7 +36,11 @@ class BottomSheetCollapseCallback(
 		)
 	}
 
-	override fun handleOnBackPressed() {
-		behavior.state = STATE_COLLAPSED
-	}
+	override fun handleOnBackPressed() = behavior.handleBackInvoked()
+
+	override fun handleOnBackCancelled() = behavior.cancelBackProgress()
+
+	override fun handleOnBackProgressed(backEvent: BackEventCompat) = behavior.updateBackProgress(backEvent)
+
+	override fun handleOnBackStarted(backEvent: BackEventCompat) = behavior.startBackProgress(backEvent)
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ChipsView.kt

@@ -12,6 +12,8 @@ import com.google.android.material.chip.ChipGroup
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.castOrNull
 
+import com.google.android.material.R as materialR
+
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
@@ -24,7 +26,9 @@ class ChipsView @JvmOverloads constructor(
 		onChipClickListener?.onChipClick(it as Chip, it.tag)
 	}
 	private val chipOnCloseListener = OnClickListener {
-		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
+		val chip = it as Chip
+		val data = it.tag
+		onChipCloseClickListener?.onChipCloseClick(chip, data) ?: onChipClickListener?.onChipClick(chip, data)
 	}
 	private val chipStyle: Int
 	var onChipClickListener: OnChipClickListener? = null
@@ -48,7 +52,7 @@ class ChipsView @JvmOverloads constructor(
 		if (isInEditMode) {
 			setChips(
 				List(5) {
-					ChipModel(0, "Chip $it", 0, isCheckable = false, isChecked = false)
+					ChipModel(title = "Chip $it")
 				},
 			)
 		}
@@ -99,6 +103,15 @@ class ChipsView @JvmOverloads constructor(
 			chip.isChipIconVisible = true
 		}
 		chip.isChecked = model.isChecked
+		chip.isCheckedIconVisible = chip.isCheckable && model.icon == 0
+		chip.isCloseIconVisible = if (onChipCloseClickListener != null || model.isDropdown) {
+			chip.setCloseIconResource(
+				if (model.isDropdown) R.drawable.ic_expand_more else materialR.drawable.ic_m3_chip_close,
+			)
+			true
+		} else {
+			false
+		}
 		chip.tag = model.data
 	}
 
@@ -106,12 +119,11 @@ class ChipsView @JvmOverloads constructor(
 		val chip = Chip(context)
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, chipStyle)
 		chip.setChipDrawable(drawable)
-		chip.isCheckedIconVisible = true
 		chip.isChipIconVisible = false
-		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
+		chip.isElegantTextHeight = false
 		addView(chip)
 		return chip
 	}
@@ -127,11 +139,12 @@ class ChipsView @JvmOverloads constructor(
 	}
 
 	data class ChipModel(
-		@ColorRes val tint: Int,
 		val title: CharSequence,
-		@DrawableRes val icon: Int,
-		val isCheckable: Boolean,
-		val isChecked: Boolean,
+		@DrawableRes val icon: Int = 0,
+		val isCheckable: Boolean = false,
+		@ColorRes val tint: Int = 0,
+		val isChecked: Boolean = false,
+		val isDropdown: Boolean = false,
 		val data: Any? = null,
 	)
 

app/src/main/kotlin/org/koitharu/kotatsu/core/util/LocaleComparator.kt

@@ -1,14 +1,27 @@
 package org.koitharu.kotatsu.core.util
 
 import androidx.core.os.LocaleListCompat
-import org.koitharu.kotatsu.core.util.ext.map
+import org.koitharu.kotatsu.core.util.ext.iterator
 import java.util.Locale
 
 class LocaleComparator : Comparator<Locale> {
 
-	private val deviceLocales = LocaleListCompat.getAdjustedDefault()//LocaleManagerCompat.getSystemLocales(context)
-		.map { it.language }
-		.distinct()
+	private val deviceLocales: List<String>
+
+	init {
+		val localeList = LocaleListCompat.getAdjustedDefault()
+		deviceLocales = buildList(localeList.size() + 1) {
+			add("")
+			val set = HashSet<String>(localeList.size() + 1)
+			set.add("")
+			for (locale in localeList) {
+				val lang = locale.language
+				if (set.add(lang)) {
+					add(lang)
+				}
+			}
+		}
+	}
 
 	override fun compare(a: Locale, b: Locale): Int {
 		val indexA = deviceLocales.indexOf(a.language)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/LocaleList.kt

@@ -22,11 +22,10 @@ fun LocaleListCompat.getOrThrow(index: Int) = get(index) ?: throw NoSuchElementE
 
 fun String.toLocale() = Locale(this)
 
-fun Locale?.getDisplayName(context: Context): String {
-	if (this == null) {
-		return context.getString(R.string.various_languages)
-	}
-	return getDisplayLanguage(this).toTitleCase(this)
+fun Locale?.getDisplayName(context: Context): String = when (this) {
+	null -> context.getString(R.string.all_languages)
+	Locale.ROOT -> context.getString(R.string.various_languages)
+	else -> getDisplayLanguage(this).toTitleCase(this)
 }
 
 private class LocaleListCompatIterator(private val list: LocaleListCompat) : ListIterator<Locale> {

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

@@ -31,14 +31,15 @@ import coil.request.ImageRequest
 import coil.request.SuccessResult
 import coil.transform.CircleCropTransformation
 import coil.util.CoilUtils
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.model.FavouriteCategory
@@ -153,8 +154,8 @@ class DetailsActivity :
 		viewBinding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 		viewBinding.chipsTags.onChipClickListener = this
 		TitleScrollCoordinator(viewBinding.textViewTitle).attach(viewBinding.scrollView)
-		viewBinding.containerBottomSheet?.let { BottomSheetBehavior.from(it) }?.let { behavior ->
-			onBackPressedDispatcher.addCallback(BottomSheetCollapseCallback(behavior))
+		viewBinding.containerBottomSheet?.let { sheet ->
+			onBackPressedDispatcher.addCallback(BottomSheetCollapseCallback(sheet))
 		}
 
 		viewModel.details.filterNotNull().observe(this, ::onMangaUpdated)
@@ -198,6 +199,8 @@ class DetailsActivity :
 		addMenuProvider(menuProvider)
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = viewModel.manga.map { it?.isNsfw == true }
+
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_read -> openReader(isIncognitoMode = false)
@@ -613,10 +616,7 @@ class DetailsActivity :
 				ChipsView.ChipModel(
 					title = tag.title,
 					tint = tagHighlighter.getTagTint(tag),
-					icon = 0,
 					data = tag,
-					isCheckable = false,
-					isChecked = false,
 				)
 			},
 		)

app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt

@@ -6,21 +6,22 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.Collections
 import java.util.EnumSet
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
 @Reusable
@@ -29,6 +30,7 @@ class MangaSourcesRepository @Inject constructor(
 	private val settings: AppSettings,
 ) {
 
+	private val isNewSourcesAssimilated = AtomicBoolean(false)
 	private val dao: MangaSourcesDao
 		get() = db.getSourcesDao()
 
@@ -43,25 +45,62 @@ class MangaSourcesRepository @Inject constructor(
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	suspend fun getEnabledSources(): List<MangaSource> {
+		assimilateNewSources()
 		val order = settings.sourcesSortOrder
 		return dao.findAllEnabled(order).toSources(settings.isNsfwContentDisabled, order)
 	}
 
 	suspend fun getDisabledSources(): Set<MangaSource> {
+		assimilateNewSources()
 		val result = EnumSet.copyOf(remoteSources)
 		val enabled = dao.findAllEnabledNames()
 		for (name in enabled) {
-			val source = MangaSource(name)
+			val source = name.toMangaSourceOrNull() ?: continue
 			result.remove(source)
 		}
-		if (settings.isNsfwContentDisabled) {
-			result.removeAll { it.isNsfw() }
-		}
 		return result
 	}
 
+	suspend fun getAvailableSources(
+		isDisabledOnly: Boolean,
+		isNewOnly: Boolean,
+		excludeBroken: Boolean,
+		types: Set<ContentType>,
+		query: String?,
+		locale: String?,
+		sortOrder: SourcesSortOrder?,
+	): List<MangaSource> {
+		assimilateNewSources()
+		val entities = dao.findAll().toMutableList()
+		if (isDisabledOnly) {
+			entities.removeAll { it.isEnabled }
+		}
+		if (isNewOnly) {
+			entities.retainAll { it.addedIn == BuildConfig.VERSION_CODE }
+		}
+		val sources = entities.toSources(
+			skipNsfwSources = settings.isNsfwContentDisabled,
+			sortOrder = sortOrder,
+		)
+		if (locale != null) {
+			sources.retainAll { it.locale == locale }
+		}
+		if (excludeBroken) {
+			sources.removeAll { it.isBroken }
+		}
+		if (types.isNotEmpty()) {
+			sources.retainAll { it.contentType in types }
+		}
+		if (!query.isNullOrEmpty()) {
+			sources.retainAll {
+				it.title.contains(query, ignoreCase = true) || it.name.contains(query, ignoreCase = true)
+			}
+		}
+		return sources
+	}
+
 	fun observeIsEnabled(source: MangaSource): Flow<Boolean> {
-		return dao.observeIsEnabled(source.name)
+		return dao.observeIsEnabled(source.name).onStart { assimilateNewSources() }
 	}
 
 	fun observeEnabledSourcesCount(): Flow<Int> {
@@ -69,8 +108,10 @@ class MangaSourcesRepository @Inject constructor(
 			observeIsNsfwDisabled(),
 			dao.observeEnabled(SourcesSortOrder.MANUAL),
 		) { skipNsfw, sources ->
-			sources.count { !skipNsfw || !MangaSource(it.source).isNsfw() }
-		}.distinctUntilChanged()
+			sources.count {
+				it.source.toMangaSourceOrNull()?.let { s -> !skipNsfw || !s.isNsfw() } == true
+			}
+		}.distinctUntilChanged().onStart { assimilateNewSources() }
 	}
 
 	fun observeAvailableSourcesCount(): Flow<Int> {
@@ -82,7 +123,7 @@ class MangaSourcesRepository @Inject constructor(
 			allMangaSources.count { x ->
 				x.name !in enabled && (!skipNsfw || !x.isNsfw())
 			}
-		}.distinctUntilChanged()
+		}.distinctUntilChanged().onStart { assimilateNewSources() }
 	}
 
 	fun observeEnabledSources(): Flow<List<MangaSource>> = combine(
@@ -92,18 +133,18 @@ class MangaSourcesRepository @Inject constructor(
 		dao.observeEnabled(order).map {
 			it.toSources(skipNsfw, order)
 		}
-	}.flatMapLatest { it }
+	}.flatMapLatest { it }.onStart { assimilateNewSources() }
 
 	fun observeAll(): Flow<List<Pair<MangaSource, Boolean>>> = dao.observeAll().map { entities ->
 		val result = ArrayList<Pair<MangaSource, Boolean>>(entities.size)
 		for (entity in entities) {
-			val source = MangaSource(entity.source)
+			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (source in remoteSources) {
 				result.add(source to entity.isEnabled)
 			}
 		}
 		result
-	}
+	}.onStart { assimilateNewSources() }
 
 	suspend fun setSourcesEnabled(sources: Collection<MangaSource>, isEnabled: Boolean): ReversibleHandle {
 		setSourcesEnabledImpl(sources, isEnabled)
@@ -114,6 +155,7 @@ class MangaSourcesRepository @Inject constructor(
 
 	suspend fun setSourcesEnabledExclusive(sources: Set<MangaSource>) {
 		db.withTransaction {
+			assimilateNewSources()
 			for (s in remoteSources) {
 				dao.setEnabled(s.name, s in sources)
 			}
@@ -135,31 +177,34 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	fun observeNewSources(): Flow<Set<MangaSource>> = observeIsNewSourcesEnabled().flatMapLatest {
-		if (it) {
-			combine(
-				dao.observeAll(),
-				observeIsNsfwDisabled(),
-			) { entities, skipNsfw ->
-				val result = EnumSet.copyOf(remoteSources)
-				for (e in entities) {
-					result.remove(MangaSource(e.source))
-				}
-				if (skipNsfw) {
-					result.removeAll { x -> x.isNsfw() }
-				}
-				result
-			}.distinctUntilChanged()
+	fun observeHasNewSources(): Flow<Boolean> = observeIsNsfwDisabled().map { skipNsfw ->
+		val sources = dao.findAllFromVersion(BuildConfig.VERSION_CODE).toSources(skipNsfw, null)
+		sources.isNotEmpty() && sources.size != remoteSources.size
+	}.onStart { assimilateNewSources() }
+
+	fun observeHasNewSourcesForBadge(): Flow<Boolean> = combine(
+		settings.observeAsFlow(AppSettings.KEY_SOURCES_VERSION) { sourcesVersion },
+		observeIsNsfwDisabled(),
+	) { version, skipNsfw ->
+		if (version < BuildConfig.VERSION_CODE) {
+			val sources = dao.findAllFromVersion(version).toSources(skipNsfw, null)
+			sources.isNotEmpty()
 		} else {
-			assimilateNewSources()
-			flowOf(emptySet())
+			false
 		}
+	}.onStart { assimilateNewSources() }
+
+	fun clearNewSourcesBadge() {
+		settings.sourcesVersion = BuildConfig.VERSION_CODE
 	}
 
-	suspend fun assimilateNewSources(): Set<MangaSource> {
+	private suspend fun assimilateNewSources(): Boolean {
+		if (isNewSourcesAssimilated.getAndSet(true)) {
+			return false
+		}
 		val new = getNewSources()
 		if (new.isEmpty()) {
-			return emptySet()
+			return false
 		}
 		var maxSortKey = dao.getMaxSortKey()
 		val entities = new.map { x ->
@@ -167,17 +212,15 @@ class MangaSourcesRepository @Inject constructor(
 				source = x.name,
 				isEnabled = false,
 				sortKey = ++maxSortKey,
+				addedIn = BuildConfig.VERSION_CODE,
 			)
 		}
 		dao.insertIfAbsent(entities)
-		if (settings.isNsfwContentDisabled) {
-			new.removeAll { x -> x.isNsfw() }
-		}
-		return new
+		return true
 	}
 
 	suspend fun isSetupRequired(): Boolean {
-		return dao.findAll().isEmpty()
+		return settings.sourcesVersion == 0 && dao.findAllEnabledNames().isEmpty()
 	}
 
 	private suspend fun setSourcesEnabledImpl(sources: Collection<MangaSource>, isEnabled: Boolean) {
@@ -196,7 +239,7 @@ class MangaSourcesRepository @Inject constructor(
 		val entities = dao.findAll()
 		val result = EnumSet.copyOf(remoteSources)
 		for (e in entities) {
-			result.remove(MangaSource(e.source))
+			result.remove(e.source.toMangaSourceOrNull() ?: continue)
 		}
 		return result
 	}
@@ -204,10 +247,10 @@ class MangaSourcesRepository @Inject constructor(
 	private fun List<MangaSourceEntity>.toSources(
 		skipNsfwSources: Boolean,
 		sortOrder: SourcesSortOrder?,
-	): List<MangaSource> {
+	): MutableList<MangaSource> {
 		val result = ArrayList<MangaSource>(size)
 		for (entity in this) {
-			val source = MangaSource(entity.source)
+			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (skipNsfwSources && source.isNsfw()) {
 				continue
 			}
@@ -225,11 +268,9 @@ class MangaSourcesRepository @Inject constructor(
 		isNsfwContentDisabled
 	}
 
-	private fun observeIsNewSourcesEnabled() = settings.observeAsFlow(AppSettings.KEY_SOURCES_NEW) {
-		isNewSourcesTipEnabled
-	}
-
 	private fun observeSortOrder() = settings.observeAsFlow(AppSettings.KEY_SOURCES_ORDER) {
 		sourcesSortOrder
 	}
+
+	private fun String.toMangaSourceOrNull(): MangaSource? = MangaSource.entries.find { it.name == this }
 }

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt

@@ -27,7 +27,6 @@ import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.ui.util.SpanSizeResolver
-import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -40,13 +39,11 @@ import org.koitharu.kotatsu.explore.ui.adapter.ExploreListEventListener
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
-import org.koitharu.kotatsu.list.ui.model.TipModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
-import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
 import org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
 import javax.inject.Inject
@@ -56,7 +53,7 @@ class ExploreFragment :
 	BaseFragment<FragmentExploreBinding>(),
 	RecyclerViewOwner,
 	ExploreListEventListener,
-	OnListItemClickListener<MangaSourceItem>, TipView.OnButtonClickListener, ListSelectionController.Callback2 {
+	OnListItemClickListener<MangaSourceItem>, ListSelectionController.Callback2 {
 
 	@Inject
 	lateinit var coil: ImageLoader
@@ -74,7 +71,7 @@ class ExploreFragment :
 
 	override fun onViewBindingCreated(binding: FragmentExploreBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this, this) { manga, view ->
+		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this) { manga, view ->
 			startActivity(DetailsActivity.newIntent(view.context, manga))
 		}
 		sourceSelectionController = ListSelectionController(
@@ -124,18 +121,6 @@ class ExploreFragment :
 		}
 	}
 
-	override fun onPrimaryButtonClick(tipView: TipView) {
-		when ((tipView.tag as? TipModel)?.key) {
-			ExploreViewModel.TIP_NEW_SOURCES -> NewSourcesDialogFragment.show(childFragmentManager)
-		}
-	}
-
-	override fun onSecondaryButtonClick(tipView: TipView) {
-		when ((tipView.tag as? TipModel)?.key) {
-			ExploreViewModel.TIP_NEW_SOURCES -> viewModel.discardNewSources()
-		}
-	}
-
 	override fun onClick(v: View) {
 		val intent = when (v.id) {
 			R.id.button_local -> MangaListActivity.newIntent(v.context, MangaSource.LOCAL)

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt

@@ -102,12 +102,6 @@ class ExploreViewModel @Inject constructor(
 		}
 	}
 
-	fun discardNewSources() {
-		launchJob(Dispatchers.Default) {
-			sourcesRepository.assimilateNewSources()
-		}
-	}
-
 	fun requestPinShortcut(source: MangaSource) {
 		launchLoadingJob(Dispatchers.Default) {
 			shortcutManager.requestPinShortcut(source)
@@ -124,7 +118,7 @@ class ExploreViewModel @Inject constructor(
 		getSuggestionFlow(),
 		isGrid,
 		isRandomLoading,
-		sourcesRepository.observeNewSources(),
+		sourcesRepository.observeHasNewSourcesForBadge(),
 	) { content, suggestions, grid, randomLoading, newSources ->
 		buildList(content, suggestions, grid, randomLoading, newSources)
 	}.withErrorHandling()
@@ -134,7 +128,7 @@ class ExploreViewModel @Inject constructor(
 		recommendation: List<Manga>,
 		isGrid: Boolean,
 		randomLoading: Boolean,
-		newSources: Set<MangaSource>,
+		hasNewSources: Boolean,
 	): List<ListModel> {
 		val result = ArrayList<ListModel>(sources.size + 3)
 		result += ExploreButtons(randomLoading)
@@ -146,7 +140,7 @@ class ExploreViewModel @Inject constructor(
 			result += ListHeader(
 				textRes = R.string.remote_sources,
 				buttonTextRes = R.string.catalog,
-				badge = if (newSources.isNotEmpty()) "" else null,
+				badge = if (hasNewSources) "" else null,
 			)
 			sources.mapTo(result) { MangaSourceItem(it, isGrid) }
 		} else {
@@ -191,6 +185,5 @@ class ExploreViewModel @Inject constructor(
 
 		private const val TIP_SUGGESTIONS = "suggestions"
 		private const val SUGGESTIONS_COUNT = 8
-		const val TIP_NEW_SOURCES = "new_sources"
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapter.kt

@@ -4,13 +4,11 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.emptyHintAD
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.adapter.tipAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
@@ -18,7 +16,6 @@ class ExploreAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: ExploreListEventListener,
-	tipClickListener: TipView.OnButtonClickListener,
 	clickListener: OnListItemClickListener<MangaSourceItem>,
 	mangaClickListener: OnListItemClickListener<Manga>,
 ) : BaseListAdapter<ListModel>() {
@@ -34,6 +31,5 @@ class ExploreAdapter(
 		addDelegate(ListItemType.EXPLORE_SOURCE_GRID, exploreSourceGridItemAD(coil, clickListener, lifecycleOwner))
 		addDelegate(ListItemType.HINT_EMPTY, emptyHintAD(coil, lifecycleOwner, listener))
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
-		addDelegate(ListItemType.TIP, tipAD(tipClickListener))
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt

@@ -257,7 +257,7 @@ class FilterCoordinator @Inject constructor(
 			}
 			oldValue.copy(
 				tagsExclude = newTags,
-				tags = oldValue.tags - newTags
+				tags = oldValue.tags - newTags,
 			)
 		}
 	}
@@ -308,7 +308,7 @@ class FilterCoordinator @Inject constructor(
 		currentState.update { oldValue ->
 			oldValue.copy(
 				tags = tags,
-				tagsExclude = oldValue.tagsExclude - tags
+				tagsExclude = oldValue.tagsExclude - tags,
 			)
 		}
 	}
@@ -391,9 +391,7 @@ class FilterCoordinator @Inject constructor(
 		val result = LinkedList<ChipsView.ChipModel>()
 		for (tag in tags) {
 			val model = ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = selectedTags.remove(tag),
 				data = tag,
@@ -406,9 +404,7 @@ class FilterCoordinator @Inject constructor(
 		}
 		for (tag in selectedTags) {
 			val model = ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = true,
 				data = tag,

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterHeaderFragment.kt

@@ -61,10 +61,7 @@ class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsV
 	}
 
 	private fun moreTagsChip() = ChipsView.ChipModel(
-		tint = 0,
 		title = getString(R.string.more),
 		icon = materialR.drawable.abc_ic_menu_overflow_material,
-		isCheckable = false,
-		isChecked = false,
 	)
 }

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.core.ui.model.titleRes
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.core.util.ext.showDistinct
@@ -29,7 +30,6 @@ import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.toTitleCase
 import java.util.Locale
 import com.google.android.material.R as materialR
 
@@ -122,10 +122,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 			b.spinnerLocale.context,
 			android.R.layout.simple_spinner_dropdown_item,
 			android.R.id.text1,
-			value.availableItems.map {
-				it?.getDisplayLanguage(it)?.toTitleCase(it)
-					?: b.spinnerLocale.context.getString(R.string.various_languages)
-			},
+			value.availableItems.map { it.getDisplayName(b.spinnerLocale.context) },
 		)
 		val selectedIndex = value.availableItems.indexOf(selected)
 		if (selectedIndex >= 0) {
@@ -144,9 +141,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		val chips = ArrayList<ChipsView.ChipModel>(value.selectedItems.size + value.availableItems.size + 1)
 		value.selectedItems.mapTo(chips) { tag ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = true,
 				data = tag,
@@ -155,9 +150,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		value.availableItems.mapNotNullTo(chips) { tag ->
 			if (tag !in value.selectedItems) {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = tag.title,
-					icon = 0,
 					isCheckable = true,
 					isChecked = false,
 					data = tag,
@@ -168,12 +161,8 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		chips.add(
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(R.string.more),
 				icon = materialR.drawable.abc_ic_menu_overflow_material,
-				isCheckable = false,
-				isChecked = false,
-				data = null,
 			),
 		)
 		b.chipsGenres.setChips(chips)
@@ -200,9 +189,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		value.availableItems.mapNotNullTo(chips) { tag ->
 			if (tag !in value.selectedItems) {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = tag.title,
-					icon = 0,
 					isCheckable = true,
 					isChecked = false,
 					data = tag,
@@ -213,12 +200,8 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		chips.add(
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(R.string.more),
 				icon = materialR.drawable.abc_ic_menu_overflow_material,
-				isCheckable = false,
-				isChecked = false,
-				data = null,
 			),
 		)
 		b.chipsGenresExclude.setChips(chips)
@@ -233,9 +216,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		val chips = value.availableItems.map { state ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(state.titleResId),
-				icon = 0,
 				isCheckable = true,
 				isChecked = state in value.selectedItems,
 				data = state,
@@ -253,9 +234,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		val chips = value.availableItems.map { contentRating ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(contentRating.titleResId),
-				icon = 0,
 				isCheckable = true,
 				isChecked = contentRating in value.selectedItems,
 				data = contentRating,

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt

@@ -37,9 +37,6 @@ suspend fun Manga.toListDetailedModel(
 		ChipsView.ChipModel(
 			tint = extraProvider?.getTagTint(it) ?: 0,
 			title = it.title,
-			icon = 0,
-			isCheckable = false,
-			isChecked = false,
 			data = it,
 		)
 	},

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt

@@ -85,10 +85,7 @@ class PreviewViewModel @Inject constructor(
 			ChipsView.ChipModel(
 				title = tag.title,
 				tint = extraProvider.getTagTint(tag),
-				icon = 0,
 				data = tag,
-				isCheckable = false,
-				isChecked = false,
 			)
 		}
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())

app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt

@@ -227,9 +227,11 @@ class LocalMangaRepository @Inject constructor(
 		}.filterNotNullTo(ArrayList(files.size))
 	}
 
-	private suspend fun getAllFiles() = storageManager.getReadableDirs().asSequence().flatMap { dir ->
-		dir.children()
-	}
+	private suspend fun getAllFiles() = storageManager.getReadableDirs()
+		.asSequence()
+		.flatMap { dir ->
+			dir.children().filterNot { it.isHidden }
+		}
 
 	private fun Collection<LocalManga>.unwrap(): List<Manga> = map { it.manga }
 }

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/protect/ScreenshotPolicyHelper.kt

@@ -0,0 +1,61 @@
+package org.koitharu.kotatsu.main.ui.protect
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.WindowManager
+import androidx.annotation.MainThread
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.core.ui.DefaultActivityLifecycleCallbacks
+import javax.inject.Inject
+
+class ScreenshotPolicyHelper @Inject constructor(
+	private val settings: AppSettings,
+) : DefaultActivityLifecycleCallbacks {
+
+	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+		(activity as? ContentContainer)?.setupScreenshotPolicy(activity)
+	}
+
+	private fun ContentContainer.setupScreenshotPolicy(activity: Activity) =
+		lifecycleScope.launch(Dispatchers.Default) {
+			settings.observeAsFlow(AppSettings.KEY_SCREENSHOTS_POLICY) { screenshotsPolicy }
+				.flatMapLatest { policy ->
+					when (policy) {
+						ScreenshotsPolicy.ALLOW -> flowOf(false)
+						ScreenshotsPolicy.BLOCK_NSFW -> withContext(Dispatchers.Main) {
+							isNsfwContent()
+						}.distinctUntilChanged()
+
+						ScreenshotsPolicy.BLOCK_ALL -> flowOf(true)
+						ScreenshotsPolicy.BLOCK_INCOGNITO -> settings.observeAsFlow(AppSettings.KEY_INCOGNITO_MODE) {
+							isIncognitoModeEnabled
+						}
+					}
+				}.collect { isSecure ->
+					withContext(Dispatchers.Main) {
+						if (isSecure) {
+							activity.window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+						} else {
+							activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+						}
+					}
+				}
+		}
+
+	interface ContentContainer : LifecycleOwner {
+
+		@MainThread
+		fun isNsfwContent(): Flow<Boolean>
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/welcome/WelcomeSheet.kt

@@ -18,13 +18,13 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.databinding.SheetWelcomeBinding
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment
 import java.util.Locale
 
@@ -58,7 +58,7 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 	override fun onChipClick(chip: Chip, data: Any?) {
 		when (data) {
 			is ContentType -> viewModel.setTypeChecked(data, chip.isChecked)
-			is Locale? -> viewModel.setLocaleChecked(data, chip.isChecked)
+			is Locale -> viewModel.setLocaleChecked(data, chip.isChecked)
 		}
 	}
 
@@ -86,14 +86,12 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 		}
 	}
 
-	private fun onLocalesChanged(value: FilterProperty<Locale?>) {
+	private fun onLocalesChanged(value: FilterProperty<Locale>) {
 		val chips = viewBinding?.chipsLocales ?: return
 		chips.setChips(
 			value.availableItems.map {
 				ChipsView.ChipModel(
-					tint = 0,
-					title = it?.getDisplayLanguage(it)?.toTitleCase(it) ?: getString(R.string.various_languages),
-					icon = 0,
+					title = it.getDisplayName(chips.context),
 					isCheckable = true,
 					isChecked = it in value.selectedItems,
 					data = it,
@@ -107,9 +105,7 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 		chips.setChips(
 			value.availableItems.map {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = getString(it.titleResId),
-					icon = 0,
 					isCheckable = true,
 					isChecked = it in value.selectedItems,
 					data = it,

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/welcome/WelcomeViewModel.kt

@@ -11,6 +11,7 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.LocaleComparator
 import org.koitharu.kotatsu.core.util.ext.sortedWithSafe
 import org.koitharu.kotatsu.core.util.ext.toList
+import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.parsers.model.ContentType
@@ -27,14 +28,14 @@ class WelcomeViewModel @Inject constructor(
 ) : BaseViewModel() {
 
 	private val allSources = repository.allMangaSources
-	private val localesGroups by lazy { allSources.groupBy { it.locale?.let { x -> Locale(x) } } }
+	private val localesGroups by lazy { allSources.groupBy { it.locale.toLocale() } }
 
 	private var updateJob: Job
 
 	val locales = MutableStateFlow(
-		FilterProperty<Locale?>(
-			availableItems = listOf(null),
-			selectedItems = setOf(null),
+		FilterProperty<Locale>(
+			availableItems = listOf(Locale.ROOT),
+			selectedItems = setOf(Locale.ROOT),
 			isLoading = true,
 			error = null,
 		),
@@ -51,22 +52,23 @@ class WelcomeViewModel @Inject constructor(
 
 	init {
 		updateJob = launchJob(Dispatchers.Default) {
-			val languages = localesGroups.keys.associateBy { x -> x?.language }
-			val selectedLocales = HashSet<Locale?>(2)
-			selectedLocales += ConfigurationCompat.getLocales(context.resources.configuration).toList()
+			val languages = localesGroups.keys.associateBy { x -> x.language }
+			val selectedLocales = HashSet<Locale>(2)
+			ConfigurationCompat.getLocales(context.resources.configuration).toList()
 				.firstNotNullOfOrNull { lc -> languages[lc.language] }
-			selectedLocales += null
+				?.let { selectedLocales += it }
+			selectedLocales += Locale.ROOT
 			locales.value = locales.value.copy(
-				availableItems = localesGroups.keys.sortedWithSafe(nullsFirst(LocaleComparator())),
+				availableItems = localesGroups.keys.sortedWithSafe(LocaleComparator()),
 				selectedItems = selectedLocales,
 				isLoading = false,
 			)
-			repository.assimilateNewSources()
+			repository.clearNewSourcesBadge()
 			commit()
 		}
 	}
 
-	fun setLocaleChecked(locale: Locale?, isChecked: Boolean) {
+	fun setLocaleChecked(locale: Locale, isChecked: Boolean) {
 		val snapshot = locales.value
 		locales.value = snapshot.copy(
 			selectedItems = if (isChecked) {
@@ -99,7 +101,7 @@ class WelcomeViewModel @Inject constructor(
 	}
 
 	private suspend fun commit() {
-		val languages = locales.value.selectedItems.mapToSet { it?.language }
+		val languages = locales.value.selectedItems.mapToSet { it.language }
 		val types = types.value.selectedItems
 		val enabledSources = allSources.filterTo(EnumSet.noneOf(MangaSource::class.java)) { x ->
 			x.contentType in types && x.locale in languages

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

@@ -28,6 +28,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.BuildConfig
@@ -142,7 +143,6 @@ class ReaderActivity :
 		viewModel.content.observe(this) {
 			onLoadingStateChanged(viewModel.isLoading.value)
 		}
-		viewModel.isScreenshotsBlockEnabled.observe(this, this::setWindowSecure)
 		viewModel.isKeepScreenOnEnabled.observe(this, this::setKeepScreenOn)
 		viewModel.isInfoBarEnabled.observe(this, ::onReaderBarChanged)
 		viewModel.isBookmarkAdded.observe(this, MenuInvalidator(this))
@@ -179,6 +179,8 @@ class ReaderActivity :
 		viewModel.onPause()
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = viewModel.isMangaNsfw
+
 	override fun onIdle() {
 		viewModel.saveCurrentState(readerManager.currentReader?.getCurrentState())
 	}
@@ -297,14 +299,6 @@ class ReaderActivity :
 			.show()
 	}
 
-	private fun setWindowSecure(isSecure: Boolean) {
-		if (isSecure) {
-			window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-		} else {
-			window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-		}
-	}
-
 	private fun setKeepScreenOn(isKeep: Boolean) {
 		if (isKeep) {
 			window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)

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

@@ -11,7 +11,9 @@ import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.os.BatteryManager
+import android.os.Build
 import android.util.AttributeSet
+import android.view.RoundedCorner
 import android.view.View
 import android.view.WindowInsets
 import androidx.annotation.AttrRes
@@ -46,8 +48,10 @@ 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 insetLeftFallback: Int
+	private val insetRightFallback: Int
+	private val insetTopFallback: Int
+	private val insetCornerFallback = getSystemUiDimensionOffset("rounded_corner_content_padding")
 	private val colorText = ColorUtils.setAlphaComponent(
 		context.getThemeColor(materialR.attr.colorOnSurface, Color.BLACK),
 		200,
@@ -80,14 +84,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 			paint.strokeWidth = getDimension(R.styleable.ReaderInfoBarView_android_strokeWidth, 2f)
 			paint.textSize = getDimension(R.styleable.ReaderInfoBarView_android_textSize, 16f)
 		}
-		val insetCorner = getSystemUiDimensionOffset("rounded_corner_content_padding")
-		val fallbackInset = resources.getDimensionPixelOffset(R.dimen.reader_bar_inset_fallback)
-		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", fallbackInset) + insetCorner
-		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", fallbackInset) + insetCorner
+		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start")
+		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end")
 		val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
-		insetLeft = if (isRtl) insetEnd else insetStart
-		insetRight = if (isRtl) insetStart else insetEnd
-		insetTop = minOf(insetLeft, insetRight)
+		insetLeftFallback = if (isRtl) insetEnd else insetStart
+		insetRightFallback = if (isRtl) insetStart else insetEnd
+		insetTopFallback = minOf(insetLeftFallback, insetRightFallback)
 	}
 
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -110,12 +112,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		paint.textAlign = Paint.Align.LEFT
 		canvas.drawTextOutline(
 			text,
-			(paddingLeft + insetLeft + cutoutInsetLeft).toFloat(),
+			(paddingLeft + insetLeft).toFloat(),
 			paddingTop + insetTop + ty,
 		)
 		if (isTimeVisible) {
 			paint.textAlign = Paint.Align.RIGHT
-			var endX = (width - paddingRight - insetRight - cutoutInsetRight).toFloat()
+			var endX = (width - paddingRight - insetRight).toFloat()
 			canvas.drawTextOutline(timeText, endX, paddingTop + insetTop + ty)
 			if (batteryText.isNotEmpty()) {
 				paint.getTextBounds(timeText, 0, timeText.length, textBounds)
@@ -221,15 +223,29 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	}
 
 	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()
+		insetLeft = insetLeftFallback
+		insetRight = insetRightFallback
+		insetTop = insetTopFallback
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && insetsCompat != null) {
+			val nativeInsets = insetsCompat.toWindowInsets()
+			nativeInsets?.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT)?.let { corner ->
+				insetLeft += corner.radius
 			}
-			if (rect.right >= width - paddingRight) {
-				cutoutInsetRight += rect.width()
+			nativeInsets?.getRoundedCorner(RoundedCorner.POSITION_TOP_RIGHT)?.let { corner ->
+				insetRight += corner.radius
+			}
+		} else {
+			insetLeft += insetCornerFallback
+			insetRight += insetCornerFallback
+		}
+		insetsCompat?.displayCutout?.let { cutout ->
+			for (rect in cutout.boundingRects) {
+				if (rect.left <= paddingLeft) {
+					insetLeft += rect.width()
+				}
+				if (rect.right >= width - paddingRight) {
+					insetRight += rect.width()
+				}
 			}
 		}
 	}

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

@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
@@ -38,7 +39,6 @@ import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
-import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
@@ -166,13 +166,9 @@ class ReaderViewModel @Inject constructor(
 		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null),
 	)
 
-	val isScreenshotsBlockEnabled = combine(
-		mangaFlow,
-		settings.observeAsFlow(AppSettings.KEY_SCREENSHOTS_POLICY) { screenshotsPolicy },
-	) { manga, policy ->
-		policy == ScreenshotsPolicy.BLOCK_ALL ||
-			(policy == ScreenshotsPolicy.BLOCK_NSFW && manga != null && manga.isNsfw)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, false)
+	val isMangaNsfw = mangaFlow.map {
+		it?.isNsfw == true
+	}
 
 	val isBookmarkAdded = currentState.flatMapLatest { state ->
 		val manga = mangaData.value?.toManga()

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

@@ -15,11 +15,14 @@ import androidx.fragment.app.commit
 import com.google.android.material.appbar.AppBarLayout
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
 import org.koitharu.kotatsu.core.parser.MangaIntent
@@ -58,6 +61,8 @@ class MangaListActivity :
 			"Cannot find FilterOwner fragment in ${supportFragmentManager.fragments}"
 		}.filter
 
+	private var source: MangaSource? = null
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityMangaListBinding.inflate(layoutInflater))
@@ -66,16 +71,19 @@ class MangaListActivity :
 		if (viewBinding.containerFilterHeader != null) {
 			viewBinding.appbar.addOnOffsetChangedListener(this)
 		}
-		val source = intent.getStringExtra(EXTRA_SOURCE)?.let(::MangaSource) ?: tags?.firstOrNull()?.source
-		if (source == null) {
+		source = intent.getStringExtra(EXTRA_SOURCE)?.let(::MangaSource) ?: tags?.firstOrNull()?.source
+		val src = source
+		if (src == null) {
 			finishAfterTransition()
-			return
+		} else {
+			viewBinding.buttonOrder?.setOnClickListener(this)
+			title = if (src == MangaSource.LOCAL) getString(R.string.local_storage) else src.title
+			initList(src, tags)
 		}
-		viewBinding.buttonOrder?.setOnClickListener(this)
-		title = if (source == MangaSource.LOCAL) getString(R.string.local_storage) else source.title
-		initList(source, tags)
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = flowOf(source?.isNsfw() == true)
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		viewBinding.root.updatePadding(
 			left = insets.left,

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt

@@ -172,12 +172,8 @@ class SearchSuggestionViewModel @Inject constructor(
 
 	private fun mapTags(tags: List<MangaTag>): List<ChipsView.ChipModel> = tags.map { tag ->
 		ChipsView.ChipModel(
-			tint = 0,
 			title = tag.title,
-			icon = 0,
 			data = tag,
-			isCheckable = false,
-			isChecked = false,
 		)
 	}
 }

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

@@ -43,6 +43,12 @@ class RootSettingsFragment : BasePreferenceFragment(0) {
 		}
 	}
 
+	override fun setTitle(title: CharSequence?) {
+		if (!resources.getBoolean(R.bool.is_tablet)) {
+			super.setTitle(title)
+		}
+	}
+
 	private fun bindPreferenceSummary(key: String, @StringRes vararg items: Int) {
 		findPreference<Preference>(key)?.summary = items.joinToString { getString(it) }
 	}

app/src/main/kotlin/org/koitharu/kotatsu/settings/SettingsActivity.kt

@@ -1,11 +1,8 @@
 package org.koitharu.kotatsu.settings
 
-import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
 import android.view.ViewGroup.MarginLayoutParams
 import androidx.core.graphics.Insets
 import androidx.core.view.updateLayoutParams
@@ -44,9 +41,12 @@ class SettingsActivity :
 	private val isMasterDetails
 		get() = viewBinding.containerMaster != null
 
+	private var screenPadding = 0
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivitySettingsBinding.inflate(layoutInflater))
+		screenPadding = resources.getDimensionPixelOffset(R.dimen.screen_padding)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		val fm = supportFragmentManager
 		val currentFragment = fm.findFragmentById(R.id.container)
@@ -59,38 +59,7 @@ class SettingsActivity :
 				replace(R.id.container_master, RootSettingsFragment())
 			}
 		}
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		super.onCreateOptionsMenu(menu)
-		menuInflater.inflate(R.menu.opt_settings, menu)
-		return true
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
-		R.id.action_leaks -> {
-			val intent = Intent()
-			intent.component = ComponentName(this, "leakcanary.internal.activity.LeakActivity")
-			intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-			startActivity(intent)
-			true
-		}
-
-		R.id.action_tracker -> {
-			val intent = Intent()
-			intent.component = ComponentName(this, "org.koitharu.kotatsu.tracker.ui.debug.TrackerDebugActivity")
-			startActivity(intent)
-			true
-		}
-
-		R.id.action_works -> {
-			val intent = Intent()
-			intent.component = ComponentName(this, "org.koitharu.workinspector.WorkInspectorActivity")
-			startActivity(intent)
-			true
-		}
-
-		else -> super.onOptionsItemSelected(item)
+		addMenuProvider(SettingsMenuProvider(this))
 	}
 
 	override fun onPreferenceStartFragment(
@@ -109,8 +78,8 @@ class SettingsActivity :
 			left = insets.left,
 			right = insets.right,
 		)
-		viewBinding.cardDetails?.updateLayoutParams<MarginLayoutParams> {
-			bottomMargin = marginStart + insets.bottom
+		viewBinding.textViewHeader?.updateLayoutParams<MarginLayoutParams> {
+			topMargin = screenPadding + insets.top
 		}
 	}
 
@@ -125,7 +94,7 @@ class SettingsActivity :
 		supportFragmentManager.commit {
 			setReorderingAllowed(true)
 			replace(R.id.container, fragment)
-			setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
+			setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
 			if (!isMasterDetails || (hasFragment && !isFromRoot)) {
 				addToBackStack(null)
 			}

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt

@@ -1,76 +0,0 @@
-package org.koitharu.kotatsu.settings.newsources
-
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.viewModels
-import coil.ImageLoader
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.databinding.DialogOnboardBinding
-import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class NewSourcesDialogFragment :
-	AlertDialogFragment<DialogOnboardBinding>(),
-	SourceConfigListener,
-	DialogInterface.OnClickListener {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private val viewModel by viewModels<NewSourcesViewModel>()
-
-	override fun onCreateViewBinding(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	): DialogOnboardBinding {
-		return DialogOnboardBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewBindingCreated(binding: DialogOnboardBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		val adapter = SourcesSelectAdapter(this, coil, viewLifecycleOwner)
-		binding.recyclerView.adapter = adapter
-		binding.textViewTitle.setText(R.string.new_sources_text)
-
-		viewModel.content.observe(viewLifecycleOwner) { adapter.items = it }
-	}
-
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder)
-			.setPositiveButton(R.string.done, this)
-			.setCancelable(true)
-			.setTitle(R.string.remote_sources)
-	}
-
-	override fun onClick(dialog: DialogInterface, which: Int) {
-		dialog.dismiss()
-	}
-
-	override fun onItemSettingsClick(item: SourceConfigItem.SourceItem) = Unit
-
-	override fun onItemLiftClick(item: SourceConfigItem.SourceItem) = Unit
-
-	override fun onItemShortcutClick(item: SourceConfigItem.SourceItem) = Unit
-
-	override fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
-		viewModel.onItemEnabledChanged(item, isEnabled)
-	}
-
-	override fun onCloseTip(tip: SourceConfigItem.Tip) = Unit
-
-	companion object {
-
-		private const val TAG = "NewSources"
-
-		fun show(fm: FragmentManager) = NewSourcesDialogFragment().show(fm, TAG)
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt

@@ -1,52 +0,0 @@
-package org.koitharu.kotatsu.settings.newsources
-
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
-import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.util.SuspendLazy
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
-import javax.inject.Inject
-
-@HiltViewModel
-class NewSourcesViewModel @Inject constructor(
-	private val repository: MangaSourcesRepository,
-	private val settings: AppSettings,
-) : BaseViewModel() {
-
-	private val newSources = SuspendLazy {
-		repository.assimilateNewSources()
-	}
-	val content: StateFlow<List<SourceConfigItem>> = repository.observeAll()
-		.map { sources ->
-			val new = newSources.get()
-			val skipNsfw = settings.isNsfwContentDisabled
-			sources.mapNotNull { (source, enabled) ->
-				if (source in new) {
-					SourceConfigItem.SourceItem(
-						source = source,
-						isEnabled = enabled,
-						isDraggable = false,
-						isAvailable = !skipNsfw || source.contentType != ContentType.HENTAI,
-					)
-				} else {
-					null
-				}
-			}
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, emptyList())
-
-	fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
-		launchJob(Dispatchers.Default) {
-			repository.setSourcesEnabled(setOf(item.source), isEnabled)
-		}
-	}
-}
-

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/SourcesSelectAdapter.kt

@@ -1,19 +0,0 @@
-package org.koitharu.kotatsu.settings.newsources
-
-import androidx.lifecycle.LifecycleOwner
-import coil.ImageLoader
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
-import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
-import org.koitharu.kotatsu.settings.sources.adapter.sourceConfigItemCheckableDelegate
-import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
-
-class SourcesSelectAdapter(
-	listener: SourceConfigListener,
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-) : BaseListAdapter<SourceConfigItem>() {
-
-	init {
-		delegatesManager.addDelegate(sourceConfigItemCheckableDelegate(listener, coil, lifecycleOwner))
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItem.kt

@@ -9,7 +9,6 @@ sealed interface SourceCatalogItem : ListModel {
 
 	data class Source(
 		val source: MangaSource,
-		val showSummary: Boolean,
 	) : SourceCatalogItem {
 
 		override fun areItemsTheSame(other: ListModel): Boolean {

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourceCatalogItemAD.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.settings.sources.catalog
 
+import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -15,6 +16,7 @@ import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.crossfade
+import org.koitharu.kotatsu.core.util.ext.drawableStart
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
@@ -22,28 +24,32 @@ import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ItemCatalogPageBinding
 import org.koitharu.kotatsu.databinding.ItemEmptyHintBinding
 import org.koitharu.kotatsu.databinding.ItemSourceCatalogBinding
+import org.koitharu.kotatsu.list.ui.model.ListModel
 
 fun sourceCatalogItemSourceAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: OnListItemClickListener<SourceCatalogItem.Source>
-) = adapterDelegateViewBinding<SourceCatalogItem.Source, SourceCatalogItem, ItemSourceCatalogBinding>(
+) = adapterDelegateViewBinding<SourceCatalogItem.Source, ListModel, ItemSourceCatalogBinding>(
 	{ layoutInflater, parent ->
 		ItemSourceCatalogBinding.inflate(layoutInflater, parent, false)
 	},
 ) {
 
 	binding.imageViewAdd.setOnClickListener { v ->
+		listener.onItemLongClick(item, v)
+	}
+	binding.root.setOnClickListener { v ->
 		listener.onItemClick(item, v)
 	}
 
 	bind {
 		binding.textViewTitle.text = item.source.getTitle(context)
-		if (item.showSummary) {
-			binding.textViewDescription.text = item.source.getSummary(context)
-			binding.textViewDescription.isVisible = true
+		binding.textViewDescription.text = item.source.getSummary(context)
+		binding.textViewDescription.drawableStart = if (item.source.isBroken) {
+			ContextCompat.getDrawable(context, R.drawable.ic_off_small)
 		} else {
-			binding.textViewDescription.isVisible = false
+			null
 		}
 		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
@@ -61,7 +67,7 @@ fun sourceCatalogItemSourceAD(
 fun sourceCatalogItemHintAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-) = adapterDelegateViewBinding<SourceCatalogItem.Hint, SourceCatalogItem, ItemEmptyHintBinding>(
+) = adapterDelegateViewBinding<SourceCatalogItem.Hint, ListModel, ItemEmptyHintBinding>(
 	{ inflater, parent -> ItemEmptyHintBinding.inflate(inflater, parent, false) },
 ) {
 

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourcesCatalogActivity.kt

@@ -1,41 +1,46 @@
 package org.koitharu.kotatsu.settings.sources.catalog
 
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.activity.viewModels
+import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
-import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import coil.ImageLoader
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.tabs.TabLayoutMediator
+import com.google.android.material.chip.Chip
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.combine
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.ui.widgets.ChipsView.ChipModel
+import org.koitharu.kotatsu.core.util.LocaleComparator
 import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.databinding.ActivitySourcesCatalogBinding
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
+import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class SourcesCatalogActivity : BaseActivity<ActivitySourcesCatalogBinding>(),
 	OnListItemClickListener<SourceCatalogItem.Source>,
-	AppBarOwner, MenuItem.OnActionExpandListener {
+	AppBarOwner, MenuItem.OnActionExpandListener, ChipsView.OnChipClickListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
 
-	private var newSourcesSnackbar: Snackbar? = null
-
 	override val appBar: AppBarLayout
 		get() = viewBinding.appbar
 
@@ -45,18 +50,20 @@ class SourcesCatalogActivity : BaseActivity<ActivitySourcesCatalogBinding>(),
 		super.onCreate(savedInstanceState)
 		setContentView(ActivitySourcesCatalogBinding.inflate(layoutInflater))
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		val pagerAdapter = SourcesCatalogPagerAdapter(this, coil, this)
-		viewBinding.pager.adapter = pagerAdapter
-		val tabMediator = TabLayoutMediator(viewBinding.tabs, viewBinding.pager, pagerAdapter)
-		tabMediator.attach()
-		viewModel.content.observe(this, pagerAdapter)
-		viewModel.hasNewSources.observe(this, ::onHasNewSourcesChanged)
+		val sourcesAdapter = SourcesCatalogAdapter(this, coil, this)
+		with(viewBinding.recyclerView) {
+			setHasFixedSize(true)
+			addItemDecoration(TypedListSpacingDecoration(context, false))
+			adapter = sourcesAdapter
+		}
+		viewBinding.chipsFilter.onChipClickListener = this
+		viewModel.content.observe(this, sourcesAdapter)
 		viewModel.onActionDone.observeEvent(
 			this,
-			ReversibleActionObserver(viewBinding.pager),
+			ReversibleActionObserver(viewBinding.recyclerView),
 		)
-		viewModel.locale.observe(this) {
-			supportActionBar?.subtitle = it?.toLocale().getDisplayName(this)
+		combine(viewModel.appliedFilter, viewModel.hasNewSources, ::Pair).observe(this) {
+			updateFilers(it.first, it.second)
 		}
 		addMenuProvider(SourcesCatalogMenuProvider(this, viewModel, this))
 	}
@@ -66,51 +73,85 @@ class SourcesCatalogActivity : BaseActivity<ActivitySourcesCatalogBinding>(),
 			left = insets.left,
 			right = insets.right,
 		)
+		viewBinding.recyclerView.updatePadding(
+			bottom = insets.bottom,
+		)
+	}
+
+	override fun onChipClick(chip: Chip, data: Any?) {
+		when (data) {
+			is ContentType -> viewModel.setContentType(data, chip.isChecked)
+			is Boolean -> viewModel.setNewOnly(chip.isChecked)
+			else -> showLocalesMenu(chip)
+		}
 	}
 
 	override fun onItemClick(item: SourceCatalogItem.Source, view: View) {
+		startActivity(MangaListActivity.newIntent(this, item.source))
+	}
+
+	override fun onItemLongClick(item: SourceCatalogItem.Source, view: View): Boolean {
 		viewModel.addSource(item.source)
+		return false
 	}
 
 	override fun onMenuItemActionExpand(item: MenuItem): Boolean {
-		viewBinding.tabs.isVisible = false
-		viewBinding.pager.isUserInputEnabled = false
 		val sq = (item.actionView as? SearchView)?.query?.trim()?.toString().orEmpty()
 		viewModel.performSearch(sq)
 		return true
 	}
 
 	override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
-		viewBinding.tabs.isVisible = true
-		viewBinding.pager.isUserInputEnabled = true
 		viewModel.performSearch(null)
 		return true
 	}
 
-	private fun onHasNewSourcesChanged(hasNewSources: Boolean) {
+	private fun updateFilers(
+		appliedFilter: SourcesCatalogFilter,
+		hasNewSources: Boolean,
+	) {
+		val chips = ArrayList<ChipModel>(ContentType.entries.size + 2)
+		chips += ChipModel(
+			title = appliedFilter.locale?.toLocale().getDisplayName(this),
+			icon = R.drawable.ic_language,
+			isDropdown = true,
+		)
 		if (hasNewSources) {
-			if (newSourcesSnackbar?.isShownOrQueued == true) {
-				return
-			}
-			val snackbar = Snackbar.make(viewBinding.pager, R.string.new_sources_text, Snackbar.LENGTH_INDEFINITE)
-			snackbar.setAction(R.string.explore) {
-				NewSourcesDialogFragment.show(supportFragmentManager)
-			}
-			snackbar.addCallback(
-				object : Snackbar.Callback() {
-					override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
-						super.onDismissed(transientBottomBar, event)
-						if (event == DISMISS_EVENT_SWIPE) {
-							viewModel.skipNewSources()
-						}
-					}
-				},
+			chips += ChipModel(
+				title = getString(R.string._new),
+				icon = R.drawable.ic_updated_selector,
+				isCheckable = true,
+				isChecked = appliedFilter.isNewOnly,
+				data = true,
 			)
-			snackbar.show()
-			newSourcesSnackbar = snackbar
-		} else {
-			newSourcesSnackbar?.dismiss()
-			newSourcesSnackbar = null
 		}
+		for (type in ContentType.entries) {
+			if (type == ContentType.HENTAI && viewModel.isNsfwDisabled) {
+				continue
+			}
+			chips += ChipModel(
+				title = getString(type.titleResId),
+				isCheckable = true,
+				isChecked = type in appliedFilter.types,
+				data = type,
+			)
+		}
+		viewBinding.chipsFilter.setChips(chips)
+	}
+
+	private fun showLocalesMenu(anchor: View) {
+		val locales = viewModel.locales.mapTo(ArrayList(viewModel.locales.size)) {
+			it to it?.toLocale()
+		}
+		locales.sortWith(compareBy(nullsFirst(LocaleComparator())) { it.second })
+		val menu = PopupMenu(this, anchor)
+		for ((i, lc) in locales.withIndex()) {
+			menu.menu.add(Menu.NONE, Menu.NONE, i, lc.second.getDisplayName(this))
+		}
+		menu.setOnMenuItemClickListener {
+			viewModel.setLocale(locales.getOrNull(it.order)?.first)
+			true
+		}
+		menu.show()
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourcesCatalogAdapter.kt

@@ -7,16 +7,19 @@ import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class SourcesCatalogAdapter(
 	listener: OnListItemClickListener<SourceCatalogItem.Source>,
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
-) : BaseListAdapter<SourceCatalogItem>(), FastScroller.SectionIndexer {
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
 		addDelegate(ListItemType.CHAPTER_LIST, sourceCatalogItemSourceAD(coil, lifecycleOwner, listener))
 		addDelegate(ListItemType.HINT_EMPTY, sourceCatalogItemHintAD(coil, lifecycleOwner))
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourcesCatalogFilter.kt

@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.settings.sources.catalog
+
+import org.koitharu.kotatsu.parsers.model.ContentType
+
+data class SourcesCatalogFilter(
+	val types: Set<ContentType>,
+	val locale: String?,
+	val isNewOnly: Boolean,
+)

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourcesCatalogListProducer.kt

@@ -1,105 +0,0 @@
-package org.koitharu.kotatsu.settings.sources.catalog
-
-import androidx.room.InvalidationTracker
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import dagger.hilt.android.ViewModelLifecycle
-import dagger.hilt.android.lifecycle.RetainedLifecycle
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.TABLE_SOURCES
-import org.koitharu.kotatsu.core.db.removeObserverAsync
-import org.koitharu.kotatsu.core.util.ext.lifecycleScope
-import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
-import org.koitharu.kotatsu.parsers.model.ContentType
-
-class SourcesCatalogListProducer @AssistedInject constructor(
-	@Assisted private val locale: String?,
-	@Assisted private val contentType: ContentType,
-	@Assisted lifecycle: ViewModelLifecycle,
-	private val repository: MangaSourcesRepository,
-	private val database: MangaDatabase,
-) : InvalidationTracker.Observer(TABLE_SOURCES), RetainedLifecycle.OnClearedListener {
-
-	private val scope = lifecycle.lifecycleScope
-	private var query: String? = null
-	val list = MutableStateFlow(emptyList<SourceCatalogItem>())
-
-	private var job = scope.launch(Dispatchers.Default) {
-		list.value = buildList()
-	}
-
-	init {
-		scope.launch(Dispatchers.Default) {
-			database.invalidationTracker.addObserver(this@SourcesCatalogListProducer)
-		}
-		lifecycle.addOnClearedListener(this)
-	}
-
-	override fun onCleared() {
-		database.invalidationTracker.removeObserverAsync(this)
-	}
-
-	override fun onInvalidated(tables: Set<String>) {
-		val prevJob = job
-		job = scope.launch(Dispatchers.Default) {
-			prevJob.cancelAndJoin()
-			list.update { buildList() }
-		}
-	}
-
-	fun setQuery(value: String?) {
-		this.query = value
-		onInvalidated(emptySet())
-	}
-
-	private suspend fun buildList(): List<SourceCatalogItem> {
-		val sources = repository.getDisabledSources().toMutableList()
-		when (val q = query) {
-			null -> sources.retainAll { it.contentType == contentType && it.locale == locale }
-			"" -> return emptyList()
-			else -> sources.retainAll { it.title.contains(q, ignoreCase = true) }
-		}
-		return if (sources.isEmpty()) {
-			listOf(
-				if (query == null) {
-					SourceCatalogItem.Hint(
-						icon = R.drawable.ic_empty_feed,
-						title = R.string.no_manga_sources,
-						text = R.string.no_manga_sources_catalog_text,
-					)
-				} else {
-					SourceCatalogItem.Hint(
-						icon = R.drawable.ic_empty_feed,
-						title = R.string.nothing_found,
-						text = R.string.no_manga_sources_found,
-					)
-				},
-			)
-		} else {
-			sources.sortBy { it.title }
-			sources.map {
-				SourceCatalogItem.Source(
-					source = it,
-					showSummary = query != null,
-				)
-			}
-		}
-	}
-
-	@AssistedFactory
-	interface Factory {
-
-		fun create(
-			locale: String?,
-			contentType: ContentType,
-			lifecycle: ViewModelLifecycle,
-		): SourcesCatalogListProducer
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourcesCatalogMenuProvider.kt

@@ -4,14 +4,9 @@ import android.app.Activity
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.MenuProvider
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.LocaleComparator
-import org.koitharu.kotatsu.core.util.ext.getDisplayName
-import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 
 class SourcesCatalogMenuProvider(
@@ -32,14 +27,7 @@ class SourcesCatalogMenuProvider(
 		searchView.queryHint = searchMenuItem.title
 	}
 
-	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
-		R.id.action_locales -> {
-			showLocalesMenu()
-			true
-		}
-
-		else -> false
-	}
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = false
 
 	override fun onMenuItemActionExpand(item: MenuItem): Boolean {
 		(activity as? AppBarOwner)?.appBar?.setExpanded(false, true)
@@ -57,24 +45,4 @@ class SourcesCatalogMenuProvider(
 		viewModel.performSearch(newText?.trim().orEmpty())
 		return true
 	}
-
-	private fun showLocalesMenu() {
-		val locales = viewModel.locales.mapTo(ArrayList(viewModel.locales.size)) {
-			it to it?.toLocale()
-		}
-		locales.sortWith(compareBy(nullsFirst(LocaleComparator())) { it.second })
-
-		val anchor: View = (activity as AppBarOwner).appBar.let {
-			it.findViewById<View?>(R.id.toolbar) ?: it
-		}
-		val menu = PopupMenu(activity, anchor)
-		for ((i, lc) in locales.withIndex()) {
-			menu.menu.add(Menu.NONE, Menu.NONE, i, lc.second.getDisplayName(activity))
-		}
-		menu.setOnMenuItemClickListener {
-			viewModel.setLocale(locales.getOrNull(it.order)?.first)
-			true
-		}
-		menu.show()
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourcesCatalogPagerAdapter.kt

@@ -1,25 +0,0 @@
-package org.koitharu.kotatsu.settings.sources.catalog
-
-import androidx.lifecycle.LifecycleOwner
-import coil.ImageLoader
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import org.koitharu.kotatsu.core.model.titleResId
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-
-class SourcesCatalogPagerAdapter(
-	listener: OnListItemClickListener<SourceCatalogItem.Source>,
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-) : BaseListAdapter<SourceCatalogPage>(), TabLayoutMediator.TabConfigurationStrategy {
-
-	init {
-		delegatesManager.addDelegate(sourceCatalogPageAD(listener, coil, lifecycleOwner))
-	}
-
-	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
-		val item = items.getOrNull(position) ?: return
-		tab.setText(item.type.titleResId)
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/catalog/SourcesCatalogViewModel.kt

@@ -1,29 +1,29 @@
 package org.koitharu.kotatsu.settings.sources.catalog
 
-import androidx.annotation.MainThread
 import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.internal.lifecycle.RetainedLifecycleImpl
+import androidx.room.invalidationTrackerFlow
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.TABLE_SOURCES
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.explore.data.SourcesSortOrder
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.mapToSet
-import java.util.EnumMap
 import java.util.EnumSet
 import java.util.Locale
 import javax.inject.Inject
@@ -31,41 +31,47 @@ import javax.inject.Inject
 @HiltViewModel
 class SourcesCatalogViewModel @Inject constructor(
 	private val repository: MangaSourcesRepository,
-	private val listProducerFactory: SourcesCatalogListProducer.Factory,
-	private val settings: AppSettings,
+	db: MangaDatabase,
+	settings: AppSettings,
 ) : BaseViewModel() {
 
-	private val lifecycle = RetainedLifecycleImpl()
-	private var searchQuery: String? = null
 	val onActionDone = MutableEventFlow<ReversibleAction>()
-	val locales = repository.allMangaSources.mapToSet { it.locale }
-	val locale = MutableStateFlow(Locale.getDefault().language.takeIf { it in locales })
+	val locales: Set<String?> = repository.allMangaSources.mapTo(HashSet<String?>()) { it.locale }.also {
+		it.add(null)
+	}
 
-	val hasNewSources = repository.observeNewSources()
-		.map { it.isNotEmpty() }
+	private val searchQuery = MutableStateFlow<String?>(null)
+	val appliedFilter = MutableStateFlow(
+		SourcesCatalogFilter(
+			types = emptySet(),
+			locale = Locale.getDefault().language.takeIf { it in locales },
+			isNewOnly = false,
+		),
+	)
+
+	val isNsfwDisabled = settings.isNsfwContentDisabled
+
+	val hasNewSources = repository.observeHasNewSources()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, false)
 
-	private val listProducers = locale.map { lc ->
-		createListProducers(lc)
-	}.stateIn(viewModelScope, SharingStarted.Eagerly, createListProducers(locale.value))
+	val content: StateFlow<List<ListModel>> = combine(
+		searchQuery,
+		appliedFilter,
+		db.invalidationTrackerFlow(TABLE_SOURCES),
+	) { q, f, _ ->
+		buildSourcesList(f, q)
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
 
-	val content: StateFlow<List<SourceCatalogPage>> = listProducers.flatMapLatest {
-		val flows = it.entries.map { (type, producer) -> producer.list.map { x -> SourceCatalogPage(type, x) } }
-		combine<SourceCatalogPage, List<SourceCatalogPage>>(flows, Array<SourceCatalogPage>::toList)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
-
-	override fun onCleared() {
-		super.onCleared()
-		lifecycle.dispatchOnCleared()
+	init {
+		repository.clearNewSourcesBadge()
 	}
 
 	fun performSearch(query: String?) {
-		searchQuery = query
-		listProducers.value.forEach { (_, v) -> v.setQuery(query) }
+		searchQuery.value = query?.trim()
 	}
 
 	fun setLocale(value: String?) {
-		locale.value = value
+		appliedFilter.value = appliedFilter.value.copy(locale = value)
 	}
 
 	fun addSource(source: MangaSource) {
@@ -75,21 +81,53 @@ class SourcesCatalogViewModel @Inject constructor(
 		}
 	}
 
-	fun skipNewSources() {
-		launchJob {
-			repository.assimilateNewSources()
+	fun setContentType(value: ContentType, isAdd: Boolean) {
+		val filter = appliedFilter.value
+		val types = EnumSet.noneOf(ContentType::class.java)
+		types.addAll(filter.types)
+		if (isAdd) {
+			types.add(value)
+		} else {
+			types.remove(value)
 		}
+		appliedFilter.value = filter.copy(types = types)
 	}
 
-	@MainThread
-	private fun createListProducers(lc: String?): Map<ContentType, SourcesCatalogListProducer> {
-		val types = EnumSet.allOf(ContentType::class.java)
-		if (settings.isNsfwContentDisabled) {
-			types.remove(ContentType.HENTAI)
-		}
-		return types.associateWithTo(EnumMap(ContentType::class.java)) { type ->
-			listProducerFactory.create(lc, type, lifecycle).also {
-				it.setQuery(searchQuery)
+	fun setNewOnly(value: Boolean) {
+		appliedFilter.value = appliedFilter.value.copy(isNewOnly = value)
+	}
+
+	private suspend fun buildSourcesList(filter: SourcesCatalogFilter, query: String?): List<SourceCatalogItem> {
+		val sources = repository.getAvailableSources(
+			isDisabledOnly = true,
+			isNewOnly = filter.isNewOnly,
+			excludeBroken = false,
+			types = filter.types,
+			query = query,
+			locale = filter.locale,
+			sortOrder = SourcesSortOrder.ALPHABETIC,
+		)
+		return if (sources.isEmpty()) {
+			listOf(
+				if (query == null) {
+					SourceCatalogItem.Hint(
+						icon = R.drawable.ic_empty_feed,
+						title = R.string.no_manga_sources,
+						text = R.string.no_manga_sources_catalog_text,
+					)
+				} else {
+					SourceCatalogItem.Hint(
+						icon = R.drawable.ic_empty_feed,
+						title = R.string.nothing_found,
+						text = R.string.no_manga_sources_found,
+					)
+				},
+			)
+		} else {
+			sources.sortedBy {
+				it.isBroken
+			}.map {
+				SourceCatalogItem.Source(source = it)
 			}
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/settings/storage/MangaDirectorySelectDialog.kt

@@ -11,7 +11,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
@@ -41,7 +40,13 @@ class MangaDirectorySelectDialog : AlertDialogFragment<DialogDirectorySelectBind
 	) {
 		if (it) {
 			viewModel.refresh()
-			pickFileTreeLauncher.launch(null)
+			if (!pickFileTreeLauncher.tryLaunch(null)) {
+				Toast.makeText(
+					context ?: return@registerForActivityResult,
+					R.string.operation_not_supported,
+					Toast.LENGTH_SHORT,
+				).show()
+			}
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/settings/userdata/UserDataSettingsFragment.kt

@@ -10,6 +10,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.view.postDelayed
 import androidx.fragment.app.viewModels
+import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
@@ -22,6 +23,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
 import org.koitharu.kotatsu.core.prefs.SearchSuggestionType
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
@@ -29,6 +31,7 @@ import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.setDefaultValueCompat
 import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.parsers.util.mapToSet
@@ -63,6 +66,10 @@ class UserDataSettingsFragment : BasePreferenceFragment(R.string.data_and_privac
 			appShortcutManager.isDynamicShortcutsAvailable()
 		findPreference<TwoStatePreference>(AppSettings.KEY_PROTECT_APP)
 			?.isChecked = !settings.appPassword.isNullOrEmpty()
+		findPreference<ListPreference>(AppSettings.KEY_SCREENSHOTS_POLICY)?.run {
+			entryValues = ScreenshotsPolicy.entries.names()
+			setDefaultValueCompat(ScreenshotsPolicy.ALLOW.name)
+		}
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/StatsActivity.kt

@@ -173,7 +173,7 @@ class StatsActivity : BaseActivity<ActivityStatsBinding>(),
 			.setIcon(R.drawable.ic_delete)
 			.setNegativeButton(android.R.string.cancel, null)
 			.setPositiveButton(R.string.clear) { _, _ ->
-				viewModel.clear()
+				viewModel.clearStats()
 			}.show()
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/StatsViewModel.kt

@@ -1,21 +1,14 @@
 package org.koitharu.kotatsu.stats.ui
 
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.take
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
@@ -63,7 +56,7 @@ class StatsViewModel @Inject constructor(
 		selectedCategories.value = snapshot
 	}
 
-	fun clear() {
+	fun clearStats() {
 		launchLoadingJob(Dispatchers.Default) {
 			repository.clearStats()
 			readingStats.value = emptyList()

app/src/main/kotlin/org/koitharu/kotatsu/tracker/data/TrackEntity.kt

@@ -25,6 +25,7 @@ class TrackEntity(
 	@ColumnInfo(name = "last_check_time") val lastCheckTime: Long,
 	@ColumnInfo(name = "last_chapter_date") val lastChapterDate: Long,
 	@ColumnInfo(name = "last_result") val lastResult: Int,
+	@ColumnInfo(name = "last_error") val lastError: String?,
 ) {
 
 	companion object {
@@ -42,6 +43,7 @@ class TrackEntity(
 			lastCheckTime = 0L,
 			lastChapterDate = 0,
 			lastResult = RESULT_NONE,
+			lastError = null,
 		)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt

@@ -30,10 +30,6 @@ class Tracker @Inject constructor(
 		return repository.getTracks(offset = 0, limit = limit)
 	}
 
-	suspend fun gc() {
-		repository.gc()
-	}
-
 	suspend fun fetchUpdates(
 		track: MangaTracking,
 		commit: Boolean

app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt

@@ -174,6 +174,7 @@ class TrackingRepository @Inject constructor(
 			lastCheckTime = tracking.lastCheck?.toEpochMilli() ?: 0L,
 			lastChapterDate = tracking.lastChapterDate?.toEpochMilli() ?: 0L,
 			lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
+			lastError = null,
 		)
 		db.getTracksDao().upsert(entity)
 	}
@@ -230,6 +231,7 @@ class TrackingRepository @Inject constructor(
 				lastCheckTime = System.currentTimeMillis(),
 				lastChapterDate = lastChapterDate,
 				lastResult = TrackEntity.RESULT_FAILED,
+				lastError = updates.error?.toString(),
 			)
 
 			is MangaUpdates.Success -> TrackEntity(
@@ -239,6 +241,7 @@ class TrackingRepository @Inject constructor(
 				lastCheckTime = System.currentTimeMillis(),
 				lastChapterDate = updates.lastChapterDate().ifZero { lastChapterDate },
 				lastResult = if (updates.isNotEmpty()) TrackEntity.RESULT_HAS_UPDATE else TrackEntity.RESULT_NO_UPDATE,
+				lastError = null,
 			)
 		}
 	}

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

@@ -0,0 +1,13 @@
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="16dp"
+	android:height="16dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+
+	<path
+		android:fillColor="#000"
+		android:pathData="M22.11 21.46L2.39 1.73L1.11 3L6.25 8.14C6.1 8.41 6 8.7 6 9V14.5L9.5 18V21H14.5V18L15.31 17.2L20.84 22.73L22.11 21.46M13.09 16.59L12.67 17H11.33L10.92 16.59L8 13.67V9.89L13.89 15.78L13.09 16.59M12.2 9L10.2 7H14V3H16V7C17 7 18 8 18 9V14.5L17.85 14.65L16 12.8V9.09C16 9.06 15.95 9 15.92 9H12.2M10 6.8L8 4.8V3H10V6.8Z" />
+
+</vector>

app/src/main/res/layout-w600dp-land/activity_reader.xml

@@ -18,6 +18,7 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="top"
 		android:paddingHorizontal="6dp"
+		android:paddingTop="8dp"
 		android:textSize="12sp"
 		android:visibility="gone"
 		tools:visibility="visible" />

app/src/main/res/layout-w600dp-land/activity_settings.xml

@@ -13,7 +13,7 @@
 		android:elevation="0dp"
 		android:fitsSystemWindows="true"
 		app:elevation="0dp"
-		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintEnd_toEndOf="@id/container_master"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:liftOnScroll="false">
@@ -30,50 +30,46 @@
 		android:layout_width="0dp"
 		android:layout_height="0dp"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toStartOf="@id/card_details"
+		app:layout_constraintEnd_toStartOf="@id/container"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/appbar"
 		app:layout_constraintWidth_max="400dp"
 		app:layout_constraintWidth_min="320dp"
-		app:layout_constraintWidth_percent="0.35" />
+		app:layout_constraintWidth_percent="0.4" />
 
-	<com.google.android.material.card.MaterialCardView
-		android:id="@+id/card_details"
+	<TextView
+		android:id="@+id/textView_header"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="?listPreferredItemPaddingStart"
+		android:layout_marginTop="@dimen/screen_padding"
+		android:layout_marginEnd="?listPreferredItemPaddingEnd"
+		android:gravity="center_vertical|start"
+		android:padding="8dp"
+		android:singleLine="true"
+		android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/container_master"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="@string/appearance" />
+
+	<androidx.fragment.app.FragmentContainerView
+		android:id="@id/container"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
-		android:layout_marginStart="@dimen/side_card_offset"
-		android:layout_marginTop="2dp"
-		android:layout_marginEnd="@dimen/side_card_offset"
-		android:layout_marginBottom="@dimen/side_card_offset"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@id/container_master"
-		app:layout_constraintTop_toBottomOf="@id/appbar">
+		app:layout_constraintTop_toBottomOf="@id/textView_header"
+		tools:layout="@layout/fragment_settings_sources" />
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:orientation="vertical">
-
-			<TextView
-				android:id="@+id/textView_header"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="?listPreferredItemPaddingStart"
-				android:layout_marginEnd="?listPreferredItemPaddingEnd"
-				android:gravity="center_vertical|start"
-				android:padding="8dp"
-				android:singleLine="true"
-				android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
-				tools:text="@string/appearance" />
-
-			<androidx.fragment.app.FragmentContainerView
-				android:id="@+id/container"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent" />
-
-		</LinearLayout>
-
-	</com.google.android.material.card.MaterialCardView>
+	<View
+		android:layout_width="1dp"
+		android:layout_height="0dp"
+		android:background="?colorSurfaceDim"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="@id/container_master"
+		app:layout_constraintStart_toEndOf="@id/container_master"
+		app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -28,6 +28,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="top"
+		android:padding="6dp"
 		android:textSize="12sp"
 		android:visibility="gone"
 		tools:visibility="visible" />

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

@@ -9,12 +9,13 @@
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:fitsSystemWindows="true">
+		android:fitsSystemWindows="true"
+		app:liftOnScroll="false">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
 			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
+			android:layout_height="wrap_content"
 			app:layout_collapseMode="pin" />
 
 	</com.google.android.material.appbar.AppBarLayout>

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

@@ -17,21 +17,39 @@
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
 			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize" />
+			android:layout_height="?attr/actionBarSize"
+			app:layout_scrollFlags="scroll|enterAlways|snap" />
 
-		<com.google.android.material.tabs.TabLayout
-			android:id="@+id/tabs"
+		<HorizontalScrollView
+			android:id="@+id/scrollView_chips"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			app:tabGravity="start"
-			app:tabMode="scrollable" />
+			android:clipToPadding="false"
+			android:paddingHorizontal="@dimen/list_spacing_large"
+			android:scrollbars="none">
+
+			<org.koitharu.kotatsu.core.ui.widgets.ChipsView
+				android:id="@+id/chips_filter"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:clipChildren="false"
+				android:clipToPadding="false"
+				android:paddingVertical="@dimen/margin_small"
+				app:chipStyle="@style/Widget.Kotatsu.Chip.Filter"
+				app:selectionRequired="false"
+				app:singleLine="true"
+				app:singleSelection="false" />
+
+		</HorizontalScrollView>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
-	<androidx.viewpager2.widget.ViewPager2
-		android:id="@+id/pager"
+	<org.koitharu.kotatsu.core.ui.list.fastscroll.FastScrollRecyclerView
+		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:clipToPadding="false"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -5,7 +5,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="?android:windowBackground"
+	android:background="?selectableItemBackground"
 	android:gravity="center_vertical"
 	android:minHeight="?listPreferredItemHeightSmall"
 	android:orientation="horizontal"
@@ -45,17 +45,27 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="2dp"
+			android:drawablePadding="4dp"
 			android:ellipsize="end"
+			android:gravity="center_vertical"
 			android:singleLine="true"
 			android:textAppearance="?attr/textAppearanceBodySmall"
+			tools:drawableStart="@drawable/ic_off_small"
 			tools:text="English" />
 
 	</LinearLayout>
 
+	<View
+		android:layout_width="1dp"
+		android:layout_height="match_parent"
+		android:layout_marginVertical="4dp"
+		android:background="?colorOutline" />
+
 	<ImageView
 		android:id="@+id/imageView_add"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/list_spacing_small"
 		android:background="?selectableItemBackgroundBorderless"
 		android:contentDescription="@string/add"
 		android:padding="@dimen/margin_small"

app/src/main/res/menu/opt_settings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu />

app/src/main/res/menu/opt_sources_catalog.xml

@@ -3,12 +3,6 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
-	<item
-		android:id="@+id/action_locales"
-		android:icon="@drawable/ic_expand_more"
-		android:title="@string/languages"
-		app:showAsAction="ifRoom" />
-
 	<item
 		android:id="@+id/action_search"
 		android:icon="?actionModeWebSearchDrawable"

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

@@ -632,4 +632,14 @@
     <string name="new_chapters_pattern">%1$s: %2$d</string>
     <string name="pin_navigation_ui">Замацаваць інтэрфейс навігацыі</string>
     <string name="blocked_by_server_message">Вы заблакаваныя серверам. Паспрабуйце выкарыстоўваць іншае сеткавае падлучэнне (VPN, проксі і т. д.)</string>
+    <string name="ignore_ssl_errors_summary">Вы можаце адключыць праверку SSL-сертыфіката, калі пры доступе да сеткавых рэсурсаў узнікаюць праблемы, звязаныя з SSL. Гэта можа паўплываць на вашую бяспеку. Пасля змены гэтага параметра запатрабуецца перазагрузка праграмы.</string>
+    <string name="disable_nsfw_notifications_summary">Не паказваць апавяшчэння аб абнаўленнях мангі NSFW</string>
+    <string name="tracker_debug_info">Часопіс праверкі новых раздзелаў</string>
+    <string name="tracker_debug_info_summary">Адладкавая інфармацыя аб фонавай праверцы наяўнасці новых раздзелаў</string>
+    <string name="disable_connectivity_check">Адключыць праверку падключэння</string>
+    <string name="disable_connectivity_check_summary">Прапусціць праверкі падключэння ў выпадку праблем з падключэннем (напрыклад, пераход у аўтаномны рэжым, нават калі сетка падключана)</string>
+    <string name="disable_nsfw_notifications">Адключыць апавяшчэння NSFW</string>
+    <string name="disable">Адкл.</string>
+    <string name="sources_disabled">Крыніцы адключаны</string>
+    <string name="_new">Новае</string>
 </resources>

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

@@ -637,4 +637,11 @@
     <string name="disable_connectivity_check">Desactivar el control de conectividad</string>
     <string name="ignore_ssl_errors_summary">Puede desactivar la verificación de certificados SSL en caso de que tenga problemas relacionados con SSL al acceder a recursos de red. Esto puede afectar a su seguridad. Es necesario reiniciar la aplicación después de cambiar esta configuración.</string>
     <string name="disable_connectivity_check_summary">Omitir la comprobación de la conectividad en caso de que tenga problemas con ella (por ejemplo, si pasa al modo sin conexión aunque la red esté conectada)</string>
+    <string name="disable_nsfw_notifications">Deshabilitar notificaciones NSFW</string>
+    <string name="disable_nsfw_notifications_summary">No mostrar notificaciones sobre actualizaciones de manga NSFW</string>
+    <string name="tracker_debug_info">Comprobando el registro de nuevos capítulos</string>
+    <string name="tracker_debug_info_summary">Información de depuración sobre verificaciones de antecedentes para nuevos capítulos</string>
+    <string name="_new">Nuevos</string>
+    <string name="all_languages">Todos los idiomas</string>
+    <string name="screenshots_block_incognito">Bloquear en modo incógnito</string>
 </resources>

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

@@ -637,4 +637,9 @@
     <string name="disable_connectivity_check">Di paganahin ang pagtingin sa koneksyon</string>
     <string name="disable_connectivity_check_summary">Laktawan ang pagsuri sa koneksyon kung sakaling mayroon kang isyu rito (hal. pagpunta sa offline mode kahit na nakakonekta sa network)</string>
     <string name="ignore_ssl_errors_summary">Maaaring di paganahin ang pag-verify ng mga SSL certificate kung sakaling makaharap ka ng mga isyu na nauugnay sa SSL kapag nag-a-access ng mga network resource. Ito ay makaapekto sa iyong seguridad. Kinakailangang mag-restart ang aplikasyon pagkatapos baguhin ang setting na ito.</string>
+    <string name="disable_nsfw_notifications_summary">Huwag magpakita ng mga abiso tungkol sa mga update ng NSFW manga</string>
+    <string name="tracker_debug_info">Sinusuri ang mga log ng mga bagong kabanata</string>
+    <string name="tracker_debug_info_summary">Debug na impormasyon tungkol sa mga pagsusuri sa background para sa mga bagong kabanata</string>
+    <string name="disable_nsfw_notifications">Di paganahin ang mga abisong NSFW</string>
+    <string name="_new">Mga bago</string>
 </resources>

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

@@ -631,4 +631,15 @@
     <string name="less_frequently">Moins souvent</string>
     <string name="new_chapters_pattern">%1$s : %2$d</string>
     <string name="pin_navigation_ui_summary">Ne pas masquer la barre de navigation et la vue de recherche lors du défilement</string>
+    <string name="ignore_ssl_errors_summary">Vous pouvez désactiver la vérification des certificats SSL au cas où vous rencontreriez des problèmes liés à SSL lors de l\'accès aux ressources réseau. Cela peut affecter votre sécurité. Le redémarrage de l\'application est requis après avoir modifié ce paramètre.</string>
+    <string name="frequency_of_check">Fréquence de vérification</string>
+    <string name="disable">Désactiver</string>
+    <string name="sources_disabled">Sources désactivées</string>
+    <string name="disable_connectivity_check">Désactiver la vérification de la connectivité</string>
+    <string name="disable_connectivity_check_summary">Ignorez la vérification de la connectivité au cas où vous rencontreriez des problèmes (par exemple, passage en mode hors ligne alors que le réseau est connecté)</string>
+    <string name="disable_nsfw_notifications">Désactiver les notifications NSFW</string>
+    <string name="disable_nsfw_notifications_summary">Ne pas afficher les notifications concernant les mises à jour des mangas NSFW</string>
+    <string name="tracker_debug_info">Vérification du journal des nouveaux chapitres</string>
+    <string name="tracker_debug_info_summary">Informations de débogage sur la vérification en arrière-plan des nouveaux chapitres</string>
+    <string name="_new">Nouveaux</string>
 </resources>

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

@@ -637,4 +637,11 @@
     <string name="disable_connectivity_check">कनेक्टिविटी जांच अक्षम करें</string>
     <string name="ignore_ssl_errors_summary">यदि नेटवर्क संसाधनों तक पहुँचने के दौरान आपको SSL से संबंधित समस्याओं का सामना करना पड़ता है तो आप SSL प्रमाणपत्र सत्यापन को अक्षम कर सकते हैं। इससे आपकी सुरक्षा प्रभावित हो सकती है। इस सेटिंग को बदलने के बाद एप्लिकेशन को पुनरारंभ करना आवश्यक है।</string>
     <string name="disable_connectivity_check_summary">यदि आपको कनेक्टिविटी से जुड़ी कोई समस्या है तो कनेक्टिविटी जांच को छोड़ दें (उदाहरण के लिए नेटवर्क कनेक्ट होने के बावजूद ऑफ़लाइन मोड में जाना)</string>
+    <string name="disable_nsfw_notifications">NSFW सूचनाएं अक्षम करें</string>
+    <string name="disable_nsfw_notifications_summary">NSFW मंगा अपडेट के बारे में सूचनाएं न दिखाएं</string>
+    <string name="tracker_debug_info">नए अध्याय लॉग की जांच की जा रही है</string>
+    <string name="tracker_debug_info_summary">नए अध्यायों के लिए पृष्ठभूमि जांच के बारे में जानकारी डीबग करें</string>
+    <string name="_new">नया</string>
+    <string name="all_languages">सभी भाषाएं</string>
+    <string name="screenshots_block_incognito">गुप्त मोड में ब्लॉक करें</string>
 </resources>

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

@@ -637,4 +637,11 @@
     <string name="disable_connectivity_check">Wyłącz sprawdzanie łączności</string>
     <string name="ignore_ssl_errors_summary">Możesz wyłączyć weryfikację certyfikatów SSL w przypadku wystąpienia problemów związanych z SSL podczas uzyskiwania dostępu do zasobów sieciowych. Może to mieć wpływ na Twoje bezpieczeństwo. Po zmianie tego ustawienia wymagane jest ponowne uruchomienie aplikacji.</string>
     <string name="disable_connectivity_check_summary">Pomiń sprawdzanie łączności w przypadku problemów z nią (np. przejście do trybu offline, mimo że sieć jest podłączona)</string>
+    <string name="disable_nsfw_notifications">Wyłącz powiadomienia NSFW</string>
+    <string name="disable_nsfw_notifications_summary">Nie pokazuj powiadomień o aktualizacjach mangi NSFW</string>
+    <string name="tracker_debug_info_summary">Debuguj informacje o sprawdzaniu dostępności nowych rozdziałów</string>
+    <string name="tracker_debug_info">Dziennik sprawdzania nowych rozdziałów</string>
+    <string name="_new">Nowy</string>
+    <string name="screenshots_block_incognito">Blokuj w trybie incognito</string>
+    <string name="all_languages">Wszystkie języki</string>
 </resources>

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

@@ -632,4 +632,14 @@
     <string name="pin_navigation_ui_summary">Не прятать навигационную панель и строку поиска при прокрутке</string>
     <string name="new_chapters_pattern">%1$s: %2$d</string>
     <string name="blocked_by_server_message">Вы заблокированы сервером. Попробуйте использовать другое сетевое подключение (VPN, прокси и т. д.)</string>
+    <string name="disable_connectivity_check">Отключить проверку подключения</string>
+    <string name="ignore_ssl_errors_summary">Вы можете отключить проверку сертификата SSL, если при доступе к сетевым ресурсам возникают проблемы, связанные с SSL. Это может повлиять на вашу безопасность. После изменения этого параметра потребуется перезагрузка приложения.</string>
+    <string name="tracker_debug_info_summary">Отладочная информация о фоновой проверке наличия новых глав</string>
+    <string name="tracker_debug_info">Журнал проверки новых глав</string>
+    <string name="disable_connectivity_check_summary">Пропустить проверки подключения в случае проблем с подключением (например, переход в автономный режим, даже если сеть подключена)</string>
+    <string name="disable_nsfw_notifications">Отключить уведомления NSFW</string>
+    <string name="disable_nsfw_notifications_summary">Не показывать уведомления об обновлениях манги NSFW</string>
+    <string name="disable">Откл.</string>
+    <string name="sources_disabled">Источники отключены</string>
+    <string name="_new">Новое</string>
 </resources>

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

@@ -634,4 +634,12 @@
     <string name="blocked_by_server_message">Блокирао вас је послуживач. Покушај да користиш другу мрежну везу (ВПН, прокси, итд.)</string>
     <string name="disable">Онемогући</string>
     <string name="sources_disabled">Извори су онемогућени</string>
+    <string name="disable_connectivity_check">Онемогућите проверу везе</string>
+    <string name="disable_nsfw_notifications">Онемогућите НСФВ обавештења</string>
+    <string name="disable_nsfw_notifications_summary">Не приказуј обавештења за ажурирања НСФВ манге</string>
+    <string name="ignore_ssl_errors_summary">Можеш да онемогућиш верификацију ССЛ сертификата у случају да се суочиш са проблемима везаним за ССЛ када приступаш мрежним ресурсима. Ово може утицати на твоју безбедност. Након промене овог подешавања потребно је поновно покретање апликације.</string>
+    <string name="disable_connectivity_check_summary">Прескочи проверу повезивања у случају да имаш проблема са њом (нпр. прелазак у режим ван мреже иако је мрежа повезана)</string>
+    <string name="tracker_debug_info">Провера дневника нових поглавља</string>
+    <string name="tracker_debug_info_summary">Информације о отклањању грешака о позадинским проверама за нова поглавља</string>
+    <string name="_new">Нови</string>
 </resources>

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

@@ -637,4 +637,11 @@
     <string name="disable_connectivity_check">Bağlantı denetimini devre dışı bırak</string>
     <string name="ignore_ssl_errors_summary">Ağ kaynaklarına erişirken SSL ile ilgili bir sorunla karşılaşmanız durumunda SSL sertifikaları doğrulamasını devre dışı bırakabilirsiniz. Bu durum güvenliğinizi etkileyebilir. Bu ayarı değiştirdikten sonra uygulamanın yeniden başlatılması gerekir.</string>
     <string name="disable_connectivity_check_summary">Sorun yaşamanız durumunda bağlantı denetimini atlayın (örneğin, ağ bağlı olmasına rağmen çevrim dışı moda geçiş)</string>
+    <string name="disable_nsfw_notifications">Uygunsuz bildirimleri devre dışı bırak</string>
+    <string name="disable_nsfw_notifications_summary">Uygunsuz manga güncellemeleri hakkında bildirim gösterilmesin</string>
+    <string name="tracker_debug_info">Yeni bölümler günlüğü denetleniyor</string>
+    <string name="tracker_debug_info_summary">Yeni bölümler için arka plan denetimleri hakkında hata ayıklama bilgileri</string>
+    <string name="_new">Yeni</string>
+    <string name="all_languages">Tüm diller</string>
+    <string name="screenshots_block_incognito">Gizli moddayken engelle</string>
 </resources>

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

@@ -632,4 +632,14 @@
     <string name="pin_navigation_ui">Закріпити інтерфейс навігації</string>
     <string name="pin_navigation_ui_summary">Не ховати навігаційну панель та рядок пошуку під час прокручування</string>
     <string name="blocked_by_server_message">Ви заблоковані сервером. Спробуйте використовувати інше підключення до мережі (VPN, проксі тощо)</string>
+    <string name="disable_connectivity_check">Вимкнути перевірку підключення</string>
+    <string name="ignore_ssl_errors_summary">Перевірку сертифіката SSL можна вимкнути, якщо під час доступу до мережних ресурсів виникають проблеми, пов\'язані з SSL. Це може вплинути на вашу безпеку. Після зміни цього параметра буде потрібно перезавантажити застосунок.</string>
+    <string name="disable_connectivity_check_summary">Пропустити перевірки підключення у разі проблем із підключенням (наприклад, перехід в автономний режим, навіть якщо мережа підключена)</string>
+    <string name="disable_nsfw_notifications">Вимкнути повідомлення NSFW</string>
+    <string name="tracker_debug_info">Журнал перевірки нових розділів</string>
+    <string name="tracker_debug_info_summary">Відлагоджувальна інформація про фонову перевірку наявності нових розділів</string>
+    <string name="disable_nsfw_notifications_summary">Не відображати повідомлення про оновлення манґи NSFW</string>
+    <string name="disable">Вимкнути</string>
+    <string name="sources_disabled">Джерела вимкнено</string>
+    <string name="_new">Нове</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -637,4 +637,11 @@
     <string name="disable_connectivity_check">关闭连接连通性检查</string>
     <string name="disable_connectivity_check_summary">若连通性检查存在问题可打开此选项（例：即使连接了网络但依旧提示网络断开）</string>
     <string name="ignore_ssl_errors_summary">若在连接到在线图源时SSL证书出现问题，可关闭SSL证书认证，关闭后对安全性有所影响，需要重启应用来更改设置。</string>
+    <string name="disable_nsfw_notifications">关闭成人内容提醒</string>
+    <string name="disable_nsfw_notifications_summary">不显示成人漫画的更新提醒</string>
+    <string name="tracker_debug_info">漫画更新日志</string>
+    <string name="tracker_debug_info_summary">记录漫画后台更新时的调试日志</string>
+    <string name="_new">最新</string>
+    <string name="screenshots_block_incognito">无痕模式时禁止</string>
+    <string name="all_languages">所有语言</string>
 </resources>

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

@@ -23,6 +23,7 @@
 	<string-array name="screenshots_policy" translatable="false">
 		<item>@string/screenshots_allow</item>
 		<item>@string/screenshots_block_nsfw</item>
+		<item>@string/screenshots_block_incognito</item>
 		<item>@string/screenshots_block_all</item>
 	</string-array>
 	<string-array name="network_policy" translatable="false">

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

@@ -30,11 +30,6 @@
 	<string-array name="values_track_sources_default" translatable="false">
 		<item>favourites</item>
 	</string-array>
-	<string-array name="values_screenshots_policy" translatable="false">
-		<item>allow</item>
-		<item>block_nsfw</item>
-		<item>block_all</item>
-	</string-array>
 	<string-array name="values_network_policy" translatable="false">
 		<item>1</item>
 		<item>2</item>

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

@@ -29,7 +29,6 @@
 	<dimen name="toolbar_button_margin">10dp</dimen>
 	<dimen name="widget_cover_height">116dp</dimen>
 	<dimen name="widget_cover_width">84dp</dimen>
-	<dimen name="reader_bar_inset_fallback">8dp</dimen>
 	<dimen name="scrobbling_list_spacing">12dp</dimen>
 	<dimen name="explore_grid_width">120dp</dimen>
 	<dimen name="chapter_grid_width">80dp</dimen>

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

@@ -650,4 +650,8 @@
 	<string name="disable_nsfw_notifications_summary">Do not show notifications about NSFW manga updates</string>
 	<string name="tracker_debug_info">Checking for new chapters log</string>
 	<string name="tracker_debug_info_summary">Debug information about background checks for new chapters</string>
+	<!-- In plural, used for filter -->
+	<string name="_new">New</string>
+	<string name="all_languages">All languages</string>
+	<string name="screenshots_block_incognito">Block when incognito mode</string>
 </resources>

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

@@ -125,14 +125,6 @@
 		android:title="@string/keep_screen_on"
 		app:allowDividerAbove="true" />
 
-	<ListPreference
-		android:defaultValue="allow"
-		android:entries="@array/screenshots_policy"
-		android:entryValues="@array/values_screenshots_policy"
-		android:key="screenshots_policy"
-		android:title="@string/screenshots_policy"
-		app:useSimpleSummaryProvider="true" />
-
 	<ListPreference
 		android:defaultValue="2"
 		android:entries="@array/network_policy"

app/src/main/res/xml/pref_sources.xml

@@ -31,10 +31,4 @@
 		android:summary="@string/disable_nsfw_summary"
 		android:title="@string/disable_nsfw" />
 
-	<SwitchPreferenceCompat
-		android:defaultValue="true"
-		android:key="sources_new"
-		android:summary="@string/suggest_new_sources_summary"
-		android:title="@string/suggest_new_sources" />
-
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/pref_user_data.xml

@@ -9,6 +9,13 @@
 		android:summary="@string/protect_application_summary"
 		android:title="@string/protect_application" />
 
+	<ListPreference
+		android:defaultValue="allow"
+		android:entries="@array/screenshots_policy"
+		android:key="screenshots_policy"
+		android:title="@string/screenshots_policy"
+		app:useSimpleSummaryProvider="true" />
+
 	<SwitchPreferenceCompat
 		android:key="history_exclude_nsfw"
 		android:summary="@string/exclude_nsfw_from_history_summary"

app/src/release/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt

@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.settings
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+
+@Suppress("UNUSED_PARAMETER")
+class SettingsMenuProvider(context: Context) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) = Unit
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = false
+}