Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Follow-up to template flow. #4546

Merged
merged 10 commits into from
Mar 25, 2024
Merged

Follow-up to template flow. #4546

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f88e0e1
Follow-up to template flow.
dbrant Mar 22, 2024
bdda529
Merge branch 'main' into templatesFollowup
cooltey Mar 22, 2024
1ffb7cd
Whoops.
dbrant Mar 22, 2024
6a1a66f
Put back.
dbrant Mar 22, 2024
653b165
Fix deprecated.
dbrant Mar 22, 2024
36dd1d3
Use correct label when available, instead of key.
dbrant Mar 22, 2024
eb3188a
Remove unnecessary ellipsize.
dbrant Mar 23, 2024
e78b981
Merge branch 'main' into templatesFollowup
dbrant Mar 25, 2024
5fc7f2b
Merge branch 'main' into templatesFollowup
dbrant Mar 25, 2024
3afa090
Merge branch 'main' into templatesFollowup
dbrant Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/src/main/java/org/wikipedia/dataclient/mwapi/TemplateDataResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@ class TemplateDataResponse : MwResponse() {
val description: String? = null
private val params: JsonElement? = null
val format: String? = null
@SerialName("notemplatedata") val noTemplateData: Boolean? = null
@SerialName("notemplatedata") val noTemplateData: Boolean = false

val getParams: Map<String, TemplateDataParam>? get() {
try {
if (noTemplateData != true && params != null && params !is JsonArray) {
return JsonUtil.json.decodeFromJsonElement<Map<String, TemplateDataParam>>(params)
if (params != null && params !is JsonArray) {
return if (noTemplateData) {
JsonUtil.json.decodeFromJsonElement<Map<String, JsonArray>>(params).mapValues {
TemplateDataParam()
}
} else {
JsonUtil.json.decodeFromJsonElement<Map<String, TemplateDataParam>>(params)
}
}
} catch (e: Exception) {
L.d("Error on parsing params $e")
Expand All @@ -56,6 +62,6 @@ class TemplateDataResponse : MwResponse() {

private val deprecatedAsString get() = deprecated?.jsonPrimitive?.contentOrNull

val isDeprecated get() = !deprecatedAsString.equals("false", true)
val isDeprecated get() = deprecatedAsString.equals("true", true)
dbrant marked this conversation as resolved.
Show resolved Hide resolved
}
}
6 changes: 4 additions & 2 deletions app/src/main/java/org/wikipedia/edit/templates/InsertTemplateFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ class InsertTemplateFragment : Fragment() {
private fun buildParamsInputFields(templateData: TemplateDataResponse.TemplateData) {
activity.updateInsertButton(true)
binding.templateDataParamsContainer.removeAllViews()
templateData.getParams?.filter { !it.value.isDeprecated }?.forEach {
templateData.getParams?.filter {
!it.value.isDeprecated
}?.forEach {
val itemBinding = ItemInsertTemplateBinding.inflate(layoutInflater)
val labelText = StringUtil.capitalize(it.key)
itemBinding.root.tag = false
Expand Down Expand Up @@ -77,7 +79,7 @@ class InsertTemplateFragment : Fragment() {
binding.templateDataTitle.text = StringUtil.removeNamespace(pageTitle.displayText)
binding.templateDataDescription.text = StringUtil.fromHtml(getTemplateDescription(templateData))
binding.templateDataDescription.isVisible = !binding.templateDataDescription.text.isNullOrEmpty()
binding.templateDataMissing.isVisible = templateData.noTemplateData == true
binding.templateDataMissing.isVisible = templateData.noTemplateData
binding.templateDataMissingText.text = StringUtil.fromHtml(getString(R.string.templates_description_missing_data,
getString(R.string.template_parameters_url), getString(R.string.autogenerated_parameters_url)))
binding.templateDataMissingText.movementMethod = LinkMovementMethodExt.getExternalLinkMovementMethod()
Expand Down