null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Clean up

Browse source
This commit is contained in:
ziro 2024-01-13 20:17:54 +07:00
parent 782386c7d9
commit 11a8e93841
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
4 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
View file

@ -421,7 +421,7 @@ class ExtensionManager(
private fun Extension.Installed.updateExists(availableExtension: Extension.Available? = null): Boolean { private fun Extension.Installed.updateExists(availableExtension: Extension.Available? = null): Boolean {
val availableExt = availableExtension ?: availableExtensionsFlow.value.find { it.pkgName == pkgName } val availableExt = availableExtension ?: availableExtensionsFlow.value.find { it.pkgName == pkgName }
if (availableExt == null) return false ?: return false
return (availableExt.versionCode > versionCode || availableExt.libVersion > libVersion) return (availableExt.versionCode > versionCode || availableExt.libVersion > libVersion)
} }

2
app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionApi.kt
View file

@ -98,8 +98,6 @@ internal class ExtensionApi {
libVersion = it.extractLibVersion(), libVersion = it.extractLibVersion(),
lang = it.lang, lang = it.lang,
isNsfw = it.nsfw == 1, isNsfw = it.nsfw == 1,
hasReadme = it.hasReadme == 1,
hasChangelog = it.hasChangelog == 1,
sources = it.sources ?: emptyList(), sources = it.sources ?: emptyList(),
apkName = it.apk, apkName = it.apk,
iconUrl = "$repoUrl/icon/${it.pkg}.png", iconUrl = "$repoUrl/icon/${it.pkg}.png",

8
app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt
View file

@ -13,8 +13,6 @@ sealed class Extension {
abstract val libVersion: Double abstract val libVersion: Double
abstract val lang: String? abstract val lang: String?
abstract val isNsfw: Boolean abstract val isNsfw: Boolean
abstract val hasReadme: Boolean
abstract val hasChangelog: Boolean
data class Installed( data class Installed(
override val name: String, override val name: String,
@ -24,8 +22,6 @@ sealed class Extension {
override val libVersion: Double, override val libVersion: Double,
override val lang: String, override val lang: String,
override val isNsfw: Boolean, override val isNsfw: Boolean,
override val hasReadme: Boolean,
override val hasChangelog: Boolean,
val pkgFactory: String?, val pkgFactory: String?,
val sources: List<Source>, val sources: List<Source>,
val icon: Drawable?, val icon: Drawable?,
@ -43,8 +39,6 @@ sealed class Extension {
override val libVersion: Double, override val libVersion: Double,
override val lang: String, override val lang: String,
override val isNsfw: Boolean, override val isNsfw: Boolean,
override val hasReadme: Boolean,
override val hasChangelog: Boolean,
val apkName: String, val apkName: String,
val iconUrl: String, val iconUrl: String,
val sources: List<AvailableSource>, val sources: List<AvailableSource>,
@ -68,7 +62,5 @@ sealed class Extension {
val signatureHash: String, val signatureHash: String,
override val lang: String? = null, override val lang: String? = null,
override val isNsfw: Boolean = false, override val isNsfw: Boolean = false,
override val hasReadme: Boolean = false,
override val hasChangelog: Boolean = false,
) : Extension() ) : Extension()
} }

17
app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt
View file

@ -93,11 +93,9 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
binding.version.text = infoText.joinToString(" • ") binding.version.text = infoText.joinToString(" • ")
binding.lang.text = LocaleHelper.getDisplayName(extension.lang) binding.lang.text = LocaleHelper.getDisplayName(extension.lang)
binding.warning.text = when { binding.warning.text = when {
extension is Extension.Untrusted -> itemView.context.getString(R.string.untrusted)
extension is Extension.Installed && extension.isObsolete -> itemView.context.getString(R.string.obsolete)
extension.isNsfw -> itemView.context.getString(R.string.nsfw_short) extension.isNsfw -> itemView.context.getString(R.string.nsfw_short)
else -> "" else -> ""
}.uppercase(Locale.ROOT) }.plusRepo(extension).uppercase(Locale.ROOT)
binding.installProgress.progress = item.sessionProgress ?: 0 binding.installProgress.progress = item.sessionProgress ?: 0
binding.installProgress.isVisible = item.sessionProgress != null binding.installProgress.isVisible = item.sessionProgress != null
binding.cancelButton.isVisible = item.sessionProgress != null binding.cancelButton.isVisible = item.sessionProgress != null
@ -114,6 +112,19 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
bindButton(item) bindButton(item)
} }
private fun String.plusRepo(extension: Extension): String {
val repoText = when {
extension is Extension.Untrusted -> itemView.context.getString(R.string.untrusted)
extension is Extension.Installed && extension.isObsolete -> itemView.context.getString(R.string.obsolete)
else -> ""
}
return if (isEmpty()) {
this
} else {
"$this • "
} + repoText
}
@Suppress("ResourceType") @Suppress("ResourceType")
fun bindButton(item: ExtensionItem) = with(binding.extButton) { fun bindButton(item: ExtensionItem) = with(binding.extButton) {
if (item.installStep == InstallStep.Done) return@with if (item.installStep == InstallStep.Done) return@with