Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide internal sources from UI

Browse Source 
Change wording on migration button in smartsearch
This commit is contained in:
NerdNumber9 2019-07-30 10:22:46 -04:00
parent 126d875547
commit e7abe27bb6
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
View File

@ -66,6 +66,10 @@ open class SourceManager(private val context: Context) {
fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>() fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>()
fun getVisibleCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>().filter {
it.id !in BlacklistedSources.HIDDEN_SOURCES
}
internal fun registerSource(source: Source, overwrite: Boolean = false) { internal fun registerSource(source: Source, overwrite: Boolean = false) {
// EXH --> // EXH -->
val sourceQName = source::class.qualifiedName val sourceQName = source::class.qualifiedName

2
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt
View File

@ -96,7 +96,7 @@ class CataloguePresenter(
val languages = preferences.enabledLanguages().getOrDefault() val languages = preferences.enabledLanguages().getOrDefault()
val hiddenCatalogues = preferences.hiddenCatalogues().getOrDefault() val hiddenCatalogues = preferences.hiddenCatalogues().getOrDefault()
return sourceManager.getCatalogueSources() return sourceManager.getVisibleCatalogueSources()
.filter { it.lang in languages } .filter { it.lang in languages }
.filterNot { it.id.toString() in hiddenCatalogues } .filterNot { it.id.toString() in hiddenCatalogues }
.sortedBy { "(${it.lang}) ${it.name}" } + .sortedBy { "(${it.lang}) ${it.name}" } +

2
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchPresenter.kt
View File

@ -102,7 +102,7 @@ open class CatalogueSearchPresenter(
val languages = preferencesHelper.enabledLanguages().getOrDefault() val languages = preferencesHelper.enabledLanguages().getOrDefault()
val hiddenCatalogues = preferencesHelper.hiddenCatalogues().getOrDefault() val hiddenCatalogues = preferencesHelper.hiddenCatalogues().getOrDefault()
return sourceManager.getCatalogueSources() return sourceManager.getVisibleCatalogueSources()
.filter { it.lang in languages } .filter { it.lang in languages }
.filterNot { it is LoginSource && !it.isLogged() } .filterNot { it is LoginSource && !it.isLogged() }
.filterNot { it.id.toString() in hiddenCatalogues } .filterNot { it.id.toString() in hiddenCatalogues }

6
app/src/main/java/exh/source/BlacklistedSources.kt
View File

@ -1,5 +1,7 @@
package exh.source package exh.source
import exh.MERGED_SOURCE_ID
object BlacklistedSources { object BlacklistedSources {
val NHENTAI_EXT_SOURCES = listOf(3122156392225024195) val NHENTAI_EXT_SOURCES = listOf(3122156392225024195)
val PERVEDEN_EN_EXT_SOURCES = listOf(4673633799850248749) val PERVEDEN_EN_EXT_SOURCES = listOf(4673633799850248749)
@ -35,4 +37,8 @@ object BlacklistedSources {
"eu.kanade.tachiyomi.extension.en.perveden", "eu.kanade.tachiyomi.extension.en.perveden",
"eu.kanade.tachiyomi.extension.it.perveden" "eu.kanade.tachiyomi.extension.it.perveden"
) )
val HIDDEN_SOURCES = listOf(
MERGED_SOURCE_ID
)
} }

2
app/src/main/res/layout-land/manga_info_controller.xml
View File

@ -280,7 +280,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="Replace current" /> android:text="Migrate from current" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/manga_info_controller.xml
View File

@ -308,7 +308,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="Replace current" /> android:text="Migrate from current" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>