Merge pull request #21 from mikepenz/develop

dev -> main
mikepenz · Nov 21, 2021 · aa73de8 · aa73de8
2 parents b1bccad + 40eceb1
commit aa73de8
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 43 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,8 +14,8 @@ buildscript {
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.31")
-        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.0.0-a01")
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta6-dev446")
+        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.0.0-b01")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0-beta6-dev474")
     }
 }
 

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -8,9 +8,9 @@ object Versions {
     const val markdown = "0.2.4"
 
     const val coil = "1.4.0"
-    const val compose = "1.1.0-beta02"
+    const val compose = "1.1.0-beta03"
 
-    const val material = "1.4.0"
+    const val material = "1.5.0-beta01"
     const val activityCompose = "1.4.0"
     const val lifecycleKtx = "2.3.1"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Maven stuff
 GROUP=com.mikepenz
-VERSION_NAME=0.2.1
-VERSION_CODE=201
+VERSION_NAME=0.2.2
+VERSION_CODE=202
 
 POM_URL=https://github.com/mikepenz/multiplatform-markdown-renderer
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/Code.kt b/multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/Code.kt
@@ -10,6 +10,7 @@ import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 
@@ -20,7 +21,11 @@ import androidx.compose.ui.unit.dp
  * @param modifier The modifier to be applied to the Markdown.
  */
 @Composable
-fun Code(code: String, modifier: Modifier = Modifier) {
+fun Code(
+    code: String,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified
+) {
     val scroll = rememberScrollState(0)
 
     Surface(
@@ -35,7 +40,7 @@ fun Code(code: String, modifier: Modifier = Modifier) {
             modifier = Modifier
                 .horizontalScroll(scroll)
                 .padding(8.dp),
-            style = MaterialTheme.typography.body2.copy(fontFamily = FontFamily.Monospace, color = MaterialTheme.colors.onSurface)
+            style = MaterialTheme.typography.body2.copy(fontFamily = FontFamily.Monospace, color = color)
         )
     }
 }
diff --git a/multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/Markdown.kt b/multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/Markdown.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
@@ -58,9 +59,9 @@ fun Markdown(
 
         CompositionLocalProvider(LocalReferenceLinkHandler provides ReferenceLinkHandlerImpl()) {
             parsedTree.children.forEach { node ->
-                if (!node.handleElement(content)) {
+                if (!node.handleElement(content, MaterialTheme.colors.onBackground)) {
                     node.children.forEach { child ->
-                        child.handleElement(content)
+                        child.handleElement(content, MaterialTheme.colors.onBackground)
                     }
                 }
             }
@@ -70,22 +71,22 @@ fun Markdown(
 
 
 @Composable
-private fun ASTNode.handleElement(content: String): Boolean {
+private fun ASTNode.handleElement(content: String, color: Color = Color.Unspecified): Boolean {
     var handled = true
     when (type) {
-        MarkdownTokenTypes.TEXT -> Text(getTextInNode(content).toString())
+        MarkdownTokenTypes.TEXT -> Text(getTextInNode(content).toString(), color = color)
         MarkdownTokenTypes.EOL -> Spacer(Modifier.padding(4.dp))
-        MarkdownElementTypes.CODE_FENCE -> MarkdownCodeFence(content, this)
-        MarkdownElementTypes.ATX_1 -> MarkdownHeader(content, this, MaterialTheme.typography.h2)
-        MarkdownElementTypes.ATX_2 -> MarkdownHeader(content, this, MaterialTheme.typography.h3)
-        MarkdownElementTypes.ATX_3 -> MarkdownHeader(content, this, MaterialTheme.typography.h4)
-        MarkdownElementTypes.ATX_4 -> MarkdownHeader(content, this, MaterialTheme.typography.h5)
-        MarkdownElementTypes.ATX_5 -> MarkdownHeader(content, this, MaterialTheme.typography.h6)
-        MarkdownElementTypes.ATX_6 -> MarkdownHeader(content, this, MaterialTheme.typography.h6)
-        MarkdownElementTypes.BLOCK_QUOTE -> MarkdownBlockQuote(content, this)
-        MarkdownElementTypes.PARAGRAPH -> MarkdownParagraph(content, this)
-        MarkdownElementTypes.ORDERED_LIST -> MarkdownOrderedList(content, this)
-        MarkdownElementTypes.UNORDERED_LIST -> MarkdownBulletList(content, this)
+        MarkdownElementTypes.CODE_FENCE -> MarkdownCodeFence(content, this, color = color)
+        MarkdownElementTypes.ATX_1 -> MarkdownHeader(content, this, MaterialTheme.typography.h2, color)
+        MarkdownElementTypes.ATX_2 -> MarkdownHeader(content, this, MaterialTheme.typography.h3, color)
+        MarkdownElementTypes.ATX_3 -> MarkdownHeader(content, this, MaterialTheme.typography.h4, color)
+        MarkdownElementTypes.ATX_4 -> MarkdownHeader(content, this, MaterialTheme.typography.h5, color)
+        MarkdownElementTypes.ATX_5 -> MarkdownHeader(content, this, MaterialTheme.typography.h6, color)
+        MarkdownElementTypes.ATX_6 -> MarkdownHeader(content, this, MaterialTheme.typography.h6, color)
+        MarkdownElementTypes.BLOCK_QUOTE -> MarkdownBlockQuote(content, this, color = color)
+        MarkdownElementTypes.PARAGRAPH -> MarkdownParagraph(content, this, color)
+        MarkdownElementTypes.ORDERED_LIST -> MarkdownOrderedList(content, this, color = color)
+        MarkdownElementTypes.UNORDERED_LIST -> MarkdownBulletList(content, this, color = color)
         MarkdownElementTypes.IMAGE -> MarkdownImage(content, this)
         MarkdownElementTypes.LINK_DEFINITION -> {
             val linkLabel = findChildOfType(MarkdownElementTypes.LINK_LABEL)?.getTextInNode(content)?.toString()
@@ -100,30 +101,45 @@ private fun ASTNode.handleElement(content: String): Boolean {
 }
 
 @Composable
-private fun MarkdownCodeFence(content: String, node: ASTNode, modifier: Modifier = Modifier) {
+private fun MarkdownCodeFence(
+    content: String,
+    node: ASTNode,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified
+) {
     // CODE_FENCE_START, FENCE_LANG, {content}, CODE_FENCE_END
     // val lang = node.findChildOfType(MarkdownTokenTypes.FENCE_LANG) // unused for now
     val start = node.children[2].startOffset
     val end = node.children[node.children.size - 2].endOffset
-    Code(content.subSequence(start, end).trim().toString(), modifier)
+    Code(content.subSequence(start, end).trim().toString(), modifier, color)
 }
 
 @Composable
-private fun MarkdownHeader(content: String, node: ASTNode, style: TextStyle = LocalTextStyle.current) {
+private fun MarkdownHeader(
+    content: String,
+    node: ASTNode,
+    style: TextStyle = LocalTextStyle.current,
+    color: Color = Color.Unspecified
+) {
     node.findChildOfType(MarkdownTokenTypes.ATX_CONTENT)?.let {
         Text(
             it.getTextInNode(content).trim().toString(),
-            style = style,
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = 16.dp)
+                .padding(top = 16.dp),
+            style = style,
+            color = color
         )
     }
 }
 
 @Composable
-private fun MarkdownBlockQuote(content: String, node: ASTNode, modifier: Modifier = Modifier) {
-    val color = MaterialTheme.colors.onBackground
+private fun MarkdownBlockQuote(
+    content: String,
+    node: ASTNode,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified
+) {
     Box(modifier = modifier
         .drawBehind {
             drawLine(
@@ -139,19 +155,23 @@ private fun MarkdownBlockQuote(content: String, node: ASTNode, modifier: Modifie
             append(node.getTextInNode(content).toString())
             pop()
         }
-        Text(text, modifier)
+        Text(text, modifier, color = color)
     }
 }
 
 @Composable
-private fun MarkdownParagraph(content: String, node: ASTNode) {
+private fun MarkdownParagraph(
+    content: String,
+    node: ASTNode,
+    color: Color = Color.Unspecified
+) {
     val styledText = buildAnnotatedString {
         pushStyle(MaterialTheme.typography.body1.toSpanStyle())
         buildMarkdownAnnotatedString(content, node, MaterialTheme.colors)
         pop()
     }
 
-    MarkdownText(styledText, style = MaterialTheme.typography.body1)
+    MarkdownText(styledText, style = MaterialTheme.typography.body1, color = color)
 }
 
 private fun AnnotatedString.Builder.appendMarkdownLink(content: String, node: ASTNode, colors: Colors) {
@@ -244,7 +264,12 @@ private fun MarkdownImage(content: String, node: ASTNode) {
 }
 
 @Composable
-private fun MarkdownText(text: AnnotatedString, style: TextStyle, modifier: Modifier = Modifier) {
+private fun MarkdownText(
+    text: AnnotatedString,
+    modifier: Modifier = Modifier,
+    color: Color = Color.Unspecified,
+    style: TextStyle = LocalTextStyle.current
+) {
     val uriHandler = LocalUriHandler.current
     val referenceLinkHandler = LocalReferenceLinkHandler.current
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
@@ -263,6 +288,7 @@ private fun MarkdownText(text: AnnotatedString, style: TextStyle, modifier: Modi
             }
         },
         style = style,
+        color = color,
         inlineContent = mapOf(
             TAG_IMAGE_URL to InlineTextContent(
                 Placeholder(180.sp, 180.sp, PlaceholderVerticalAlign.Bottom) // TODO, identify flexible scaling!
@@ -288,31 +314,43 @@ private fun MarkdownText(text: AnnotatedString, style: TextStyle, modifier: Modi
 internal expect fun imagePainter(url: String): Painter?
 
 @Composable
-private fun MarkdownBulletList(content: String, node: ASTNode, modifier: Modifier = Modifier, level: Int = 0) {
-    MarkdownListItems(content, node, modifier, level) { child ->
+private fun MarkdownBulletList(
+    content: String,
+    node: ASTNode,
+    modifier: Modifier = Modifier,
+    level: Int = 0,
+    color: Color = Color.Unspecified
+) {
+    MarkdownListItems(content, node, modifier, level, color) { child ->
         Row(Modifier.fillMaxWidth()) {
             Text("${child.findChildOfType(MarkdownTokenTypes.LIST_BULLET)?.getTextInNode(content)} ")
             val text = buildAnnotatedString {
                 pushStyle(MaterialTheme.typography.body1.toSpanStyle())
                 buildMarkdownAnnotatedString(content, child, MaterialTheme.colors)
                 pop()
             }
-            MarkdownText(text, MaterialTheme.typography.body1, modifier.padding(bottom = 4.dp))
+            MarkdownText(text, modifier.padding(bottom = 4.dp), style = MaterialTheme.typography.body1, color = color)
         }
     }
 }
 
 @Composable
-private fun MarkdownOrderedList(content: String, node: ASTNode, modifier: Modifier = Modifier, level: Int = 0) {
-    MarkdownListItems(content, node, modifier, level) { child ->
+private fun MarkdownOrderedList(
+    content: String,
+    node: ASTNode,
+    modifier: Modifier = Modifier,
+    level: Int = 0,
+    color: Color = Color.Unspecified
+) {
+    MarkdownListItems(content, node, modifier, level, color) { child ->
         Row(Modifier.fillMaxWidth()) {
             Text("${child.findChildOfType(MarkdownTokenTypes.LIST_NUMBER)?.getTextInNode(content)} ")
             val text = buildAnnotatedString {
                 pushStyle(MaterialTheme.typography.body1.toSpanStyle())
                 buildMarkdownAnnotatedString(content, child, MaterialTheme.colors)
                 pop()
             }
-            MarkdownText(text, MaterialTheme.typography.body1, modifier.padding(bottom = 4.dp))
+            MarkdownText(text, modifier.padding(bottom = 4.dp), style = MaterialTheme.typography.body1, color = color)
         }
     }
 }
@@ -323,14 +361,15 @@ private fun MarkdownListItems(
     node: ASTNode,
     modifier: Modifier = Modifier,
     level: Int = 0,
+    color: Color = Color.Unspecified,
     item: @Composable (child: ASTNode) -> Unit
 ) {
     Column(modifier = modifier.padding(top = 8.dp, bottom = 8.dp, start = (8.dp) * level)) {
         node.children.forEach { child ->
             when (child.type) {
                 MarkdownElementTypes.LIST_ITEM -> item(child)
-                MarkdownElementTypes.ORDERED_LIST -> MarkdownOrderedList(content, child, modifier, level + 1)
-                MarkdownElementTypes.UNORDERED_LIST -> MarkdownBulletList(content, child, modifier, level + 1)
+                MarkdownElementTypes.ORDERED_LIST -> MarkdownOrderedList(content, child, modifier, level + 1, color)
+                MarkdownElementTypes.UNORDERED_LIST -> MarkdownBulletList(content, child, modifier, level + 1, color)
             }
         }
     }