admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move untrusted/obsolete/unofficial extension text

Browse Source 
(cherry picked from commit 150ea29a70)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
This commit is contained in:
arkon
2020-06-13 17:27:03 -04:00
committed by Jobobby04
parent 1ca94a0ea8
commit 565fa58514
4 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
+9 -25
View File
@@ -9,7 +9,6 @@ import eu.kanade.tachiyomi.source.ConfigurableSource
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder
import eu.kanade.tachiyomi.util.system.LocaleHelper
import eu.kanade.tachiyomi.util.system.getResourceColor
import io.github.mthli.slice.Slice
import kotlinx.android.synthetic.main.extension_card_item.card
import kotlinx.android.synthetic.main.extension_card_item.ext_button
@@ -17,6 +16,7 @@ import kotlinx.android.synthetic.main.extension_card_item.ext_title
import kotlinx.android.synthetic.main.extension_card_item.image
import kotlinx.android.synthetic.main.extension_card_item.lang
import kotlinx.android.synthetic.main.extension_card_item.version
import kotlinx.android.synthetic.main.extension_card_item.warning
import uy.kohesive.injekt.api.get
class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
@@ -40,13 +40,15 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
val extension = item.extension
setCardEdges(item)
// Set source name
ext_title.text = extension.name
version.text = extension.versionName
lang.text = if (extension !is Extension.Untrusted) {
LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
} else {
itemView.context.getString(R.string.ext_untrusted).toUpperCase()
lang.text = LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
warning.text = when {
extension is Extension.Untrusted -> itemView.context.getString(R.string.ext_untrusted).toUpperCase()
extension is Extension.Installed && extension.isObsolete -> itemView.context.getString(R.string.ext_obsolete).toUpperCase()
extension is Extension.Installed && extension.isUnofficial -> itemView.context.getString(R.string.ext_unofficial).toUpperCase()
extension is Extension.Installed && extension.isRedundant -> itemView.context.getString(R.string.ext_redundant).toUpperCase()
else -> null
}
GlideApp.with(itemView.context).clear(image)
@@ -65,8 +67,6 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
isEnabled = true
isClickable = true
setTextColor(context.getResourceColor(R.attr.colorAccent))
val extension = item.extension
val installStep = item.installStep
@@ -89,24 +89,8 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
extension.hasUpdate -> {
setText(R.string.ext_update)
}
extension.isObsolete -> {
setTextColor(context.getResourceColor(R.attr.colorError))
setText(R.string.ext_obsolete)
}
extension.isUnofficial -> {
setTextColor(context.getResourceColor(R.attr.colorError))
setText(R.string.ext_unofficial)
}
extension.isRedundant -> {
setTextColor(context.getResourceColor(R.attr.colorError))
setText(R.string.ext_redundant)
}
else -> {
if (extension.sources.any { it is ConfigurableSource }) {
setText(R.string.action_settings)
} else {
setText(R.string.ext_details)
}
setText(R.string.action_settings)
}
}
} else if (extension is Extension.Untrusted) {