copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions 1

Remember descriptionAnnotator across composition

Browse source 
Closes mihonapp/mihon#2510

Co-authored-by: Cuong-Tran <16017808+cuong-tran@users.noreply.github.com>
(cherry picked from commit 906d6f3cdbd6f7168d9cdea0c3eb8f9c663a09c2)
This commit is contained in:
AntsyLich 2025-12-27 01:43:39 +06:00 committed by Cuong-Tran
parent c525ce49af
commit e3186b3db4
No known key found for this signature in database
GPG key ID: 94EFFE320FE7A47C
1 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
View file

@ -871,44 +871,47 @@ private fun ColumnScope.MangaContentInfo(
} }
} }
private fun descriptionAnnotator(loadImages: Boolean, linkStyle: SpanStyle) = markdownAnnotator( @Composable
annotate = { content, child -> private fun descriptionAnnotator(loadImages: Boolean, linkStyle: SpanStyle) = remember(loadImages, linkStyle) {
if (!loadImages && child.type == MarkdownElementTypes.IMAGE) { markdownAnnotator(
val inlineLink = child.findChildOfType(MarkdownElementTypes.INLINE_LINK) annotate = { content, child ->
if (!loadImages && child.type == MarkdownElementTypes.IMAGE) {
val inlineLink = child.findChildOfType(MarkdownElementTypes.INLINE_LINK)
val url = inlineLink?.findChildOfType(MarkdownElementTypes.LINK_DESTINATION) val url = inlineLink?.findChildOfType(MarkdownElementTypes.LINK_DESTINATION)
?.getUnescapedTextInNode(content)
?: inlineLink?.findChildOfType(MarkdownElementTypes.AUTOLINK)
?.findChildOfType(MarkdownTokenTypes.AUTOLINK)
?.getUnescapedTextInNode(content) ?.getUnescapedTextInNode(content)
?: return@markdownAnnotator false ?: inlineLink?.findChildOfType(MarkdownElementTypes.AUTOLINK)
?.findChildOfType(MarkdownTokenTypes.AUTOLINK)
?.getUnescapedTextInNode(content)
?: return@markdownAnnotator false
val textNode = inlineLink?.findChildOfType(MarkdownElementTypes.LINK_TITLE) val textNode = inlineLink?.findChildOfType(MarkdownElementTypes.LINK_TITLE)
?: inlineLink?.findChildOfType(MarkdownElementTypes.LINK_TEXT) ?: inlineLink?.findChildOfType(MarkdownElementTypes.LINK_TEXT)
val altText = textNode?.findChildOfType(MarkdownTokenTypes.TEXT) val altText = textNode?.findChildOfType(MarkdownTokenTypes.TEXT)
?.getUnescapedTextInNode(content).orEmpty() ?.getUnescapedTextInNode(content).orEmpty()
withLink(LinkAnnotation.Url(url = url)) { withLink(LinkAnnotation.Url(url = url)) {
pushStyle(linkStyle) pushStyle(linkStyle)
appendInlineContent(MARKDOWN_INLINE_IMAGE_TAG) appendInlineContent(MARKDOWN_INLINE_IMAGE_TAG)
append(altText) append(altText)
pop() pop()
}
return@markdownAnnotator true
} }
return@markdownAnnotator true if (child.type in DISALLOWED_MARKDOWN_TYPES) {
} append(content.substring(child.startOffset, child.endOffset))
return@markdownAnnotator true
}
if (child.type in DISALLOWED_MARKDOWN_TYPES) { false
append(content.substring(child.startOffset, child.endOffset)) },
return@markdownAnnotator true config = markdownAnnotatorConfig(
} eolAsNewLine = true,
),
false )
}, }
config = markdownAnnotatorConfig(
eolAsNewLine = true,
),
)
@Composable @Composable
private fun MangaSummary( private fun MangaSummary(