diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index 29afdfc1c..1f2ddcfb0 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -66,6 +66,10 @@ open class SourceManager(private val context: Context) { fun getCatalogueSources() = sourcesMap.values.filterIsInstance() + fun getVisibleCatalogueSources() = sourcesMap.values.filterIsInstance().filter { + it.id !in BlacklistedSources.HIDDEN_SOURCES + } + internal fun registerSource(source: Source, overwrite: Boolean = false) { // EXH --> val sourceQName = source::class.qualifiedName diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt index 55d510bb9..daac2580e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt @@ -96,7 +96,7 @@ class CataloguePresenter( val languages = preferences.enabledLanguages().getOrDefault() val hiddenCatalogues = preferences.hiddenCatalogues().getOrDefault() - return sourceManager.getCatalogueSources() + return sourceManager.getVisibleCatalogueSources() .filter { it.lang in languages } .filterNot { it.id.toString() in hiddenCatalogues } .sortedBy { "(${it.lang}) ${it.name}" } + diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchPresenter.kt index 14312da13..3719d8baa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchPresenter.kt @@ -102,7 +102,7 @@ open class CatalogueSearchPresenter( val languages = preferencesHelper.enabledLanguages().getOrDefault() val hiddenCatalogues = preferencesHelper.hiddenCatalogues().getOrDefault() - return sourceManager.getCatalogueSources() + return sourceManager.getVisibleCatalogueSources() .filter { it.lang in languages } .filterNot { it is LoginSource && !it.isLogged() } .filterNot { it.id.toString() in hiddenCatalogues } diff --git a/app/src/main/java/exh/source/BlacklistedSources.kt b/app/src/main/java/exh/source/BlacklistedSources.kt index 30f63fcfa..322f11e5f 100644 --- a/app/src/main/java/exh/source/BlacklistedSources.kt +++ b/app/src/main/java/exh/source/BlacklistedSources.kt @@ -1,5 +1,7 @@ package exh.source +import exh.MERGED_SOURCE_ID + object BlacklistedSources { val NHENTAI_EXT_SOURCES = listOf(3122156392225024195) val PERVEDEN_EN_EXT_SOURCES = listOf(4673633799850248749) @@ -35,4 +37,8 @@ object BlacklistedSources { "eu.kanade.tachiyomi.extension.en.perveden", "eu.kanade.tachiyomi.extension.it.perveden" ) + + val HIDDEN_SOURCES = listOf( + MERGED_SOURCE_ID + ) } \ No newline at end of file diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml index a849774d0..3699d6dea 100644 --- a/app/src/main/res/layout-land/manga_info_controller.xml +++ b/app/src/main/res/layout-land/manga_info_controller.xml @@ -280,7 +280,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Replace current" /> + android:text="Migrate from current" /> diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml index 28df5bf25..cd959e3ac 100755 --- a/app/src/main/res/layout/manga_info_controller.xml +++ b/app/src/main/res/layout/manga_info_controller.xml @@ -308,7 +308,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Replace current" /> + android:text="Migrate from current" />