From 1b4b42c5f8e65103e9a6f8aa6f6f02e8e8264989 Mon Sep 17 00:00:00 2001 From: Shamicen Date: Wed, 21 Feb 2024 13:34:56 +0100 Subject: [PATCH] Implemented Genre search from MangaScreen --- app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt | 3 ++- .../androidMain/kotlin/tachiyomi/source/local/LocalSource.kt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index f7dad1d8c..74a7d596f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -37,6 +37,7 @@ import eu.kanade.presentation.manga.components.SetIntervalDialog import eu.kanade.presentation.util.AssistContentScreen import eu.kanade.presentation.util.Screen import eu.kanade.presentation.util.isTabletUi +import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.isLocalOrStub import eu.kanade.tachiyomi.source.online.HttpSource @@ -346,7 +347,7 @@ class MangaScreen( } val previousController = navigator.items[navigator.size - 2] - if (previousController is BrowseSourceScreen && source is HttpSource) { + if (previousController is BrowseSourceScreen && source is CatalogueSource) { navigator.pop() previousController.searchGenre(genreName) } else { diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt index 43f96e434..4c6b2e85c 100644 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -61,7 +61,6 @@ import uy.kohesive.injekt.injectLazy import java.io.File import java.io.InputStream import java.nio.charset.StandardCharsets -import kotlin.time.Duration.Companion.days import com.github.junrar.Archive as JunrarArchive import tachiyomi.domain.source.model.Source as DomainSource