Revert "Update sources catalog ui"

This reverts commit 597ad01e8f.

.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 = 645
+		versionName = '7.1.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:26be293f24') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -94,6 +94,7 @@ dependencies {
 	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'

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/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/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/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
@@ -92,10 +93,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
 	}
 
@@ -159,6 +170,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/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/details/ui/DetailsActivity.kt

@@ -31,7 +31,6 @@ 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
@@ -153,8 +152,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)

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/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/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/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_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/menu/opt_settings.xml

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

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

@@ -632,4 +632,13 @@
     <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>
 </resources>

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

@@ -637,4 +637,8 @@
     <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>
 </resources>

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

@@ -637,4 +637,8 @@
     <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>
 </resources>

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

@@ -637,4 +637,8 @@
     <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>
 </resources>

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

@@ -632,4 +632,13 @@
     <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>
 </resources>

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

@@ -634,4 +634,7 @@
     <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>
 </resources>

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

@@ -637,4 +637,8 @@
     <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>
 </resources>

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

@@ -632,4 +632,13 @@
     <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>
 </resources>

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

@@ -637,4 +637,8 @@
     <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>
 </resources>

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
+}