From 04200bb5906577f41cdc0ffc25ffca4bdc7ddee4 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 10 Mar 2021 17:20:42 -0500 Subject: [PATCH] Cleanup --- .../tachiyomi/extension/ExtensionManager.kt | 2 +- .../eu/kanade/tachiyomi/source/SourceManager.kt | 9 ++++----- .../changehandler/OneWayFadeChangeHandler.kt | 2 +- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 8 ++------ .../ui/setting/SettingsAdvancedController.kt | 16 ++++------------ .../main/java/exh/source/BlacklistedSources.kt | 6 +++--- 6 files changed, 15 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index 52f89b5f4..6d46200d8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -164,7 +164,7 @@ class ExtensionManager( } } - fun Extension.isBlacklisted(blacklistEnabled: Boolean = preferences.enableSourceBlacklist().get()): Boolean { + private fun Extension.isBlacklisted(blacklistEnabled: Boolean = preferences.enableSourceBlacklist().get()): Boolean { return pkgName in BlacklistedSources.BLACKLISTED_EXTENSIONS && blacklistEnabled } // EXH <-- 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 a0f76fae1..72a3daba7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -155,13 +155,12 @@ open class SourceManager(private val context: Context) { // SY --> private fun createEHSources(): List { - val exSrcs = mutableListOf( + val sources = listOf( EHentai(EH_SOURCE_ID, false, context) ) - if (prefs.enableExhentai().get()) { - exSrcs += EHentai(EXH_SOURCE_ID, true, context) - } - return exSrcs + return if (prefs.enableExhentai().get()) { + sources + EHentai(EXH_SOURCE_ID, true, context) + } else sources } // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt index 5d6223eaf..0d606fb3d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt @@ -10,7 +10,7 @@ import com.bluelinelabs.conductor.changehandler.AnimatorChangeHandler import com.bluelinelabs.conductor.changehandler.FadeChangeHandler /** - * An [AnimatorChangeHandler] that will cross fade two views + * An [AnimatorChangeHandler] that will remove the from view and fade in the to view */ class OneWayFadeChangeHandler : FadeChangeHandler { constructor() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 630f46239..5d860df86 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -216,12 +216,8 @@ class MainActivity : BaseViewBindingActivity() { } // SY --> if (!preferences.isHentaiEnabled().get()) { - if (EH_SOURCE_ID !in BlacklistedSources.HIDDEN_SOURCES) { - BlacklistedSources.HIDDEN_SOURCES += EH_SOURCE_ID - } - if (EXH_SOURCE_ID !in BlacklistedSources.HIDDEN_SOURCES) { - BlacklistedSources.HIDDEN_SOURCES += EXH_SOURCE_ID - } + BlacklistedSources.HIDDEN_SOURCES += EH_SOURCE_ID + BlacklistedSources.HIDDEN_SOURCES += EXH_SOURCE_ID } // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt index 39b62ecf8..92fd72600 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt @@ -276,19 +276,11 @@ class SettingsAdvancedController : SettingsController() { onChange { if (preferences.isHentaiEnabled().get()) { - if (EH_SOURCE_ID !in BlacklistedSources.HIDDEN_SOURCES) { - BlacklistedSources.HIDDEN_SOURCES += EH_SOURCE_ID - } - if (EXH_SOURCE_ID !in BlacklistedSources.HIDDEN_SOURCES) { - BlacklistedSources.HIDDEN_SOURCES += EXH_SOURCE_ID - } + BlacklistedSources.HIDDEN_SOURCES += EH_SOURCE_ID + BlacklistedSources.HIDDEN_SOURCES += EXH_SOURCE_ID } else { - if (EH_SOURCE_ID in BlacklistedSources.HIDDEN_SOURCES) { - BlacklistedSources.HIDDEN_SOURCES -= EH_SOURCE_ID - } - if (EXH_SOURCE_ID in BlacklistedSources.HIDDEN_SOURCES) { - BlacklistedSources.HIDDEN_SOURCES -= EXH_SOURCE_ID - } + BlacklistedSources.HIDDEN_SOURCES -= EH_SOURCE_ID + BlacklistedSources.HIDDEN_SOURCES -= EXH_SOURCE_ID } true } diff --git a/app/src/main/java/exh/source/BlacklistedSources.kt b/app/src/main/java/exh/source/BlacklistedSources.kt index ff3cb4895..83ed232bb 100644 --- a/app/src/main/java/exh/source/BlacklistedSources.kt +++ b/app/src/main/java/exh/source/BlacklistedSources.kt @@ -1,7 +1,7 @@ package exh.source object BlacklistedSources { - val EHENTAI_EXT_SOURCES = listOf( + val EHENTAI_EXT_SOURCES = longArrayOf( 8100626124886895451, 57122881048805941, 4678440076103929247, @@ -23,11 +23,11 @@ object BlacklistedSources { val BLACKLISTED_EXT_SOURCES = EHENTAI_EXT_SOURCES - val BLACKLISTED_EXTENSIONS = listOf( + val BLACKLISTED_EXTENSIONS = arrayOf( "eu.kanade.tachiyomi.extension.all.ehentai" ) - var HIDDEN_SOURCES = listOf( + var HIDDEN_SOURCES = setOf( MERGED_SOURCE_ID ) }