AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Display mod categories in mod page

Browse Source
This commit is contained in:
Yair Morgenstern 2023-02-18 20:11:03 +02:00
parent bfaae54890
commit c6d035929a
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/com/unciv/ui/pickerscreens/ModManagementOptions.kt
View File

@ -22,7 +22,6 @@ import com.unciv.ui.utils.extensions.onChange
import com.unciv.ui.utils.extensions.surroundWithCircle import com.unciv.ui.utils.extensions.surroundWithCircle
import com.unciv.ui.utils.extensions.toLabel import com.unciv.ui.utils.extensions.toLabel
import com.unciv.ui.utils.extensions.toTextButton import com.unciv.ui.utils.extensions.toTextButton
import com.unciv.utils.Log
import kotlin.math.sign import kotlin.math.sign
/** /**
@ -210,6 +209,22 @@ class ModManagementOptions(private val modManagementScreen: ModManagementScreen)
} }
} }
private fun getTextButton(nameString:String, topics: List<String>): TextButton {
val categories = ArrayList<ModManagementOptions.Category>()
for (category in ModManagementOptions.Category.values()) {
if (category==ModManagementOptions.Category.All) continue
if (topics.contains(category.topic)) categories += category
}
val button = nameString.toTextButton()
val topicString = categories.joinToString { it.label.tr() }
if (categories.isNotEmpty()) {
button.row()
button.add(topicString.toLabel(fontSize = 14))
}
return button
}
/** Helper class holds combined mod info for ModManagementScreen, used for both installed and online lists */ /** Helper class holds combined mod info for ModManagementScreen, used for both installed and online lists */
class ModUIData( class ModUIData(
val name: String, val name: String,
@ -227,7 +242,7 @@ class ModUIData(
ruleset.getSummary().let { ruleset.getSummary().let {
"Installed".tr() + (if (it.isEmpty()) "" else ": $it") "Installed".tr() + (if (it.isEmpty()) "" else ": $it")
}, },
ruleset, null, 0f, 0f, ruleset.name.toTextButton() ruleset, null, 0f, 0f, getTextButton(ruleset.name, ruleset.modOptions.topics)
) )
constructor(repo: Github.Repo, isUpdated: Boolean): this ( constructor(repo: Github.Repo, isUpdated: Boolean): this (
@ -235,14 +250,16 @@ class ModUIData(
(repo.description ?: "-{No description provided}-".tr()) + (repo.description ?: "-{No description provided}-".tr()) +
"\n" + "[${repo.stargazers_count}]✯".tr(), "\n" + "[${repo.stargazers_count}]✯".tr(),
null, repo, 0f, 0f, null, repo, 0f, 0f,
(repo.name + (if (isUpdated) " - {Updated}" else "" )).toTextButton() getTextButton(repo.name + (if (isUpdated) " - {Updated}" else ""), repo.topics)
) { ) {
state.hasUpdate = isUpdated state.hasUpdate = isUpdated
} }
fun lastUpdated() = ruleset?.modOptions?.lastUpdated ?: repo?.pushed_at ?: "" fun lastUpdated() = ruleset?.modOptions?.lastUpdated ?: repo?.pushed_at ?: ""
fun stargazers() = repo?.stargazers_count ?: 0 fun stargazers() = repo?.stargazers_count ?: 0
fun author() = ruleset?.modOptions?.author ?: repo?.owner?.login ?: "" fun author() = ruleset?.modOptions?.author ?: repo?.owner?.login ?: ""
fun matchesFilter(filter: ModManagementOptions.Filter): Boolean = when { fun matchesFilter(filter: ModManagementOptions.Filter): Boolean = when {
!matchesCategory(filter) -> false !matchesCategory(filter) -> false
filter.text.isEmpty() -> true filter.text.isEmpty() -> true
@ -251,6 +268,7 @@ class ModUIData(
author().contains(filter.text, true) -> true author().contains(filter.text, true) -> true
else -> false else -> false
} }
private fun matchesCategory(filter: ModManagementOptions.Filter): Boolean { private fun matchesCategory(filter: ModManagementOptions.Filter): Boolean {
val modTopic = repo?.topics ?: ruleset?.modOptions?.topics!! val modTopic = repo?.topics ?: ruleset?.modOptions?.topics!!
if (filter.topic == ModManagementOptions.Category.All.topic) if (filter.topic == ModManagementOptions.Category.All.topic)