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 9afe89be4..dfbd97094 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -4,6 +4,7 @@ import android.content.Context import android.graphics.drawable.Drawable import com.elvishew.xlog.XLog import com.jakewharton.rxrelay.BehaviorRelay +import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi import eu.kanade.tachiyomi.extension.model.Extension @@ -16,6 +17,15 @@ import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.util.lang.launchNow import eu.kanade.tachiyomi.util.system.toast +import exh.EH_SOURCE_ID +import exh.EIGHTMUSES_SOURCE_ID +import exh.EXH_SOURCE_ID +import exh.HBROWSE_SOURCE_ID +import exh.HITOMI_SOURCE_ID +import exh.MERGED_SOURCE_ID +import exh.NHENTAI_SOURCE_ID +import exh.PERV_EDEN_EN_SOURCE_ID +import exh.PERV_EDEN_IT_SOURCE_ID import exh.source.BlacklistedSources import kotlinx.coroutines.async import rx.Observable @@ -68,7 +78,19 @@ class ExtensionManager( if (pkgName != null) { return iconMap[pkgName] ?: iconMap.getOrPut(pkgName) { context.packageManager.getApplicationIcon(pkgName) } } - return null + + return when (source.id) { + EH_SOURCE_ID -> context.getDrawable(R.mipmap.ic_ehentai_source) + EXH_SOURCE_ID -> context.getDrawable(R.mipmap.ic_ehentai_source) + PERV_EDEN_EN_SOURCE_ID -> context.getDrawable(R.mipmap.ic_perveden_source) + PERV_EDEN_IT_SOURCE_ID -> context.getDrawable(R.mipmap.ic_perveden_source) + NHENTAI_SOURCE_ID -> context.getDrawable(R.mipmap.ic_nhentai_source) + HITOMI_SOURCE_ID -> context.getDrawable(R.mipmap.ic_hitomi_source) + EIGHTMUSES_SOURCE_ID -> context.getDrawable(R.mipmap.ic_8muses_source) + HBROWSE_SOURCE_ID -> context.getDrawable(R.mipmap.ic_hbrowse_source) + MERGED_SOURCE_ID -> context.getDrawable(R.mipmap.ic_merged_source) + else -> null + } } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt index e6bf57a7f..e6e804881 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt @@ -8,15 +8,6 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.visible -import exh.EH_SOURCE_ID -import exh.EIGHTMUSES_SOURCE_ID -import exh.EXH_SOURCE_ID -import exh.HBROWSE_SOURCE_ID -import exh.HITOMI_SOURCE_ID -import exh.MERGED_SOURCE_ID -import exh.NHENTAI_SOURCE_ID -import exh.PERV_EDEN_EN_SOURCE_ID -import exh.PERV_EDEN_IT_SOURCE_ID import io.github.mthli.slice.Slice import kotlinx.android.synthetic.main.source_main_controller_card_item.card import kotlinx.android.synthetic.main.source_main_controller_card_item.image @@ -63,15 +54,6 @@ class SourceHolder(view: View, override val adapter: SourceAdapter, val showButt when { icon != null -> image.setImageDrawable(icon) item.source.id == LocalSource.ID -> image.setImageResource(R.mipmap.ic_local_source) - item.source.id == EH_SOURCE_ID -> image.setImageResource(R.mipmap.ic_ehentai_source) - item.source.id == EXH_SOURCE_ID -> image.setImageResource(R.mipmap.ic_ehentai_source) - item.source.id == PERV_EDEN_EN_SOURCE_ID -> image.setImageResource(R.mipmap.ic_perveden_source) - item.source.id == PERV_EDEN_IT_SOURCE_ID -> image.setImageResource(R.mipmap.ic_perveden_source) - item.source.id == NHENTAI_SOURCE_ID -> image.setImageResource(R.mipmap.ic_nhentai_source) - item.source.id == HITOMI_SOURCE_ID -> image.setImageResource(R.mipmap.ic_hitomi_source) - item.source.id == EIGHTMUSES_SOURCE_ID -> image.setImageResource(R.mipmap.ic_8muses_source) - item.source.id == HBROWSE_SOURCE_ID -> image.setImageResource(R.mipmap.ic_hbrowse_source) - item.source.id == MERGED_SOURCE_ID -> image.setImageResource(R.mipmap.ic_merged_source) } }