diff options
Diffstat (limited to 'core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt')
| -rw-r--r-- | core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt b/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt index 2711a2df9..59d898a2a 100644 --- a/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt +++ b/core/src/main/kotlin/Formats/JavaLayoutHtml/JavaLayoutHtmlFormatOutputBuilder.kt @@ -857,19 +857,31 @@ open class JavaLayoutHtmlFormatOutputBuilder( protected open fun FlowContent.apiAndDeprecatedVersions(node: DocumentationNode) { val apiLevelExists = node.apiLevel.name.isNotEmpty() + val sdkExtSinceExists = node.sdkExtSince.name.isNotEmpty() val deprecatedLevelExists = node.deprecatedLevel.name.isNotEmpty() - if (apiLevelExists || deprecatedLevelExists) { + if (apiLevelExists || sdkExtSinceExists || deprecatedLevelExists) { div(classes = "api-level") { if (apiLevelExists) { +"Added in " a(href = "https://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels") { +"API level ${node.apiLevel.name}" } - if (deprecatedLevelExists) { + } + if (sdkExtSinceExists) { + if (apiLevelExists) { br + +"Also in " + } else { + +"Added in " + } + a(href = "https://developer.android.com/sdkExtensions") { + +"${node.sdkExtSince.name}" } } if (deprecatedLevelExists) { + if (apiLevelExists || sdkExtSinceExists) { + br + } +"Deprecated in " a(href = "https://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels") { +"API level ${node.deprecatedLevel.name}" @@ -1056,7 +1068,7 @@ open class JavaLayoutHtmlFormatOutputBuilder( val inheritedFieldsByReceiver = allInheritedMembers.filter { - it == NodeKind.Field && it.constantValue() != null + it.kind == NodeKind.Field && it.constantValue() != null }.groupBy { it.owner!! } val originalExtensions = if (!isCompanion) node.extensions else node.owner!!.extensions @@ -1156,4 +1168,4 @@ fun DocumentationNode.constantValue(): String? = private val visibilityNames = setOf("public", "protected", "internal", "package-local", "private") fun DocumentationNode.visibility(): String = - details(NodeKind.Modifier).firstOrNull { it.name in visibilityNames }?.name ?: ""
\ No newline at end of file + details(NodeKind.Modifier).firstOrNull { it.name in visibilityNames }?.name ?: "" |