Update markdown to 0.33.0 and tweak visuals (#2024)

- Update markdown to 0.33.0
- Use github flavour for github changelog
- Fix bullet list alignment
This commit is contained in:
Secozzi
2025-04-19 18:13:05 +00:00
committed by GitHub
parent f6617a7a22
commit e2915a1f69
4 changed files with 25 additions and 6 deletions
@@ -26,7 +26,9 @@ import com.mikepenz.markdown.m3.markdownTypography
import com.mikepenz.markdown.model.MarkdownAnnotator
import com.mikepenz.markdown.model.markdownAnnotator
import com.mikepenz.markdown.model.markdownPadding
import com.mikepenz.markdown.model.rememberMarkdownState
import org.intellij.markdown.MarkdownTokenTypes.Companion.HTML_TAG
import org.intellij.markdown.flavours.MarkdownFlavourDescriptor
import org.intellij.markdown.flavours.commonmark.CommonMarkFlavourDescriptor
import org.intellij.markdown.flavours.commonmark.CommonMarkMarkerProcessor
import org.intellij.markdown.flavours.gfm.table.GitHubTableMarkerProvider
@@ -49,12 +51,18 @@ import tachiyomi.presentation.core.components.material.padding
fun MarkdownRender(
content: String,
modifier: Modifier = Modifier,
flavour: MarkdownFlavourDescriptor = SimpleMarkdownFlavourDescriptor,
annotator: MarkdownAnnotator = markdownAnnotator(),
) {
Markdown(
val markdownState = rememberMarkdownState(
content = content,
flavour = flavour,
immediate = true,
)
Markdown(
markdownState = markdownState,
annotator = annotator,
flavour = SimpleMarkdownFlavourDescriptor,
typography = mihonMarkdownTypography(),
padding = mihonMarkdownPadding(),
components = mihonMarkdownComponents(),
@@ -114,10 +122,16 @@ private fun mihonMarkdownComponents() = markdownComponents(
val markers = listOf("•", "◦", "▸", "▹")
CompositionLocalProvider(
LocalBulletListHandler provides { _, _, _, _ -> "${markers[ul.listDepth % markers.size]} " },
LocalBulletListHandler provides { _, _, _, _, _ -> "${markers[ul.listDepth % markers.size]} " },
) {
Column(modifier = Modifier.padding(start = MaterialTheme.padding.small)) {
MarkdownBulletList(ul.content, ul.node, style = ul.typography.bullet)
MarkdownBulletList(
content = ul.content,
node = ul.node,
style = ul.typography.bullet,
markerModifier = { Modifier.alignBy(FirstBaseline) },
listModifier = { Modifier.alignBy(FirstBaseline) },
)
}
}
},