From 1483b71cf03395b167a78cbd0437a5c507e366d0 Mon Sep 17 00:00:00 2001
From: "Cuong M. Tran" <cuongtran.tm@gmail.com>
Date: Mon, 10 Jun 2024 15:04:47 +0700
Subject: [PATCH] Add NSFW filter & source search into Merge: Find in another
 source

---
 .../kanade/presentation/browse/SourcesScreen.kt   |  7 +++----
 .../tachiyomi/ui/browse/source/SourcesTab.kt      | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
index 0372e64d2..61fbb0d15 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
@@ -68,14 +68,12 @@ import tachiyomi.presentation.core.components.FastScrollLazyColumn
 import tachiyomi.presentation.core.components.LabeledCheckbox
 import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
 import tachiyomi.presentation.core.components.material.padding
-import tachiyomi.presentation.core.components.material.topSmallPaddingValues
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.screens.EmptyScreen
 import tachiyomi.presentation.core.screens.LoadingScreen
 import tachiyomi.presentation.core.theme.header
 import tachiyomi.presentation.core.util.clearFocusOnSoftKeyboardHide
 import tachiyomi.presentation.core.util.isScrollingUp
-import tachiyomi.presentation.core.util.plus
 import tachiyomi.presentation.core.util.runOnEnterKeyPressed
 import tachiyomi.presentation.core.util.secondaryItemAlpha
 import tachiyomi.source.local.LocalSource
@@ -104,7 +102,9 @@ fun SourcesScreen(
             modifier = Modifier.padding(contentPadding),
         )
         // KMK -->
-        else -> Column {
+        else -> Column(
+            modifier = Modifier.padding(contentPadding),
+        ) {
             AnimatedFloatingSearchBox(
                 listState = lazyListState,
                 searchQuery = state.searchQuery,
@@ -115,7 +115,6 @@ fun SourcesScreen(
             FastScrollLazyColumn(
                 state = lazyListState,
                 // KMK <--
-                contentPadding = contentPadding + topSmallPaddingValues,
             ) {
                 items(
                     items = state.items,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
index 0d5fda4f7..ded1288cd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
@@ -70,7 +70,17 @@ fun Screen.sourcesTab(
                 ),
             )
         } else {
-            persistentListOf()
+            // Merge: find in another source
+            persistentListOf(
+                // KMK -->
+                AppBar.Action(
+                    title = stringResource(MR.strings.action_toggle_nsfw_only),
+                    icon = Icons.Outlined._18UpRating,
+                    iconTint = if (state.nsfwOnly) MaterialTheme.colorScheme.error else LocalContentColor.current,
+                    onClick = { screenModel.toggleNsfwOnly() },
+                ),
+                // KMK <--
+            )
         },
         // SY <--
         content = { contentPadding, snackbarHostState ->
@@ -119,8 +129,9 @@ fun Screen.sourcesTab(
                         onDismiss = screenModel::closeDialog,
                         // KMK -->
                         onClickSettings = {
-                            if (source.installedExtension !== null)
+                            if (source.installedExtension !== null) {
                                 navigator.push(ExtensionDetailsScreen(source.installedExtension!!.pkgName))
+                            }
                             screenModel.closeDialog()
                         },
                         // KMK <--