Skip to content

Commit 6fd1133

Browse files
committed
- rename to follow proper compose naming
1 parent b6a2097 commit 6fd1133

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/LazyMarkdown.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fun LazyMarkdownSuccess(
2929
contentPadding = contentPadding,
3030
) {
3131
items(state.node.children) { node ->
32-
handleElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)
32+
MarkdownElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)
3333
}
3434
}
3535
}

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/Markdown.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ fun MarkdownSuccess(
175175
) {
176176
Column(modifier) {
177177
state.node.children.forEach { node ->
178-
handleElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)
178+
MarkdownElement(node, components, state.content, skipLinkDefinition = state.linksLookedUp)
179179
}
180180
}
181181
}

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/elements/MarkdownBlockQuote.kt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package com.mikepenz.markdown.compose.elements
22

3-
import androidx.compose.foundation.layout.*
3+
import androidx.compose.foundation.layout.Column
4+
import androidx.compose.foundation.layout.Spacer
5+
import androidx.compose.foundation.layout.calculateStartPadding
6+
import androidx.compose.foundation.layout.height
7+
import androidx.compose.foundation.layout.padding
48
import androidx.compose.runtime.Composable
59
import androidx.compose.ui.Modifier
610
import androidx.compose.ui.draw.drawBehind
@@ -9,7 +13,12 @@ import androidx.compose.ui.graphics.isSpecified
913
import androidx.compose.ui.text.TextStyle
1014
import androidx.compose.ui.unit.LayoutDirection
1115
import androidx.compose.ui.unit.dp
12-
import com.mikepenz.markdown.compose.*
16+
import com.mikepenz.markdown.compose.LocalMarkdownColors
17+
import com.mikepenz.markdown.compose.LocalMarkdownComponents
18+
import com.mikepenz.markdown.compose.LocalMarkdownDimens
19+
import com.mikepenz.markdown.compose.LocalMarkdownPadding
20+
import com.mikepenz.markdown.compose.LocalMarkdownTypography
21+
import com.mikepenz.markdown.compose.MarkdownElement
1322
import org.intellij.markdown.MarkdownElementTypes
1423
import org.intellij.markdown.ast.ASTNode
1524
import org.intellij.markdown.ast.findChildOfType
@@ -49,7 +58,7 @@ fun MarkdownBlockQuote(
4958
if (nonBlockquotes.isNotEmpty()) {
5059
Column(modifier = Modifier.padding(blockQuoteText)) {
5160
nonBlockquotes.onEach { quote ->
52-
handleElement(node = quote, components = markdownComponents, content = content, includeSpacer = false)
61+
MarkdownElement(node = quote, components = markdownComponents, content = content, includeSpacer = false)
5362
}
5463
}
5564

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/elements/MarkdownList.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import com.mikepenz.markdown.compose.LocalMarkdownComponents
1414
import com.mikepenz.markdown.compose.LocalMarkdownPadding
1515
import com.mikepenz.markdown.compose.LocalMarkdownTypography
1616
import com.mikepenz.markdown.compose.LocalOrderedListHandler
17+
import com.mikepenz.markdown.compose.MarkdownElement
1718
import com.mikepenz.markdown.compose.components.MarkdownComponentModel
1819
import com.mikepenz.markdown.compose.components.MarkdownComponents
1920
import com.mikepenz.markdown.compose.elements.material.MarkdownBasicText
20-
import com.mikepenz.markdown.compose.handleElement
2121
import com.mikepenz.markdown.model.MarkdownPadding
2222
import com.mikepenz.markdown.model.MarkdownTypography
2323
import com.mikepenz.markdown.utils.getUnescapedTextInNode
@@ -46,7 +46,7 @@ fun MarkdownListItems(
4646
val padding = LocalMarkdownPadding.current
4747
val markdownComponents = LocalMarkdownComponents.current
4848
val markdownTypography = LocalMarkdownTypography.current
49-
49+
5050
Column(
5151
modifier = Modifier.padding(
5252
start = padding.listIndent * depth,
@@ -91,7 +91,7 @@ private fun MarkdownListItem(
9191
padding: MarkdownPadding,
9292
markerModifier: RowScope.() -> Modifier,
9393
listModifier: RowScope.() -> Modifier,
94-
bullet: @Composable (index: Int, child: ASTNode?) -> Unit
94+
bullet: @Composable (index: Int, child: ASTNode?) -> Unit,
9595
) {
9696
val checkboxNode = child.children.getOrNull(1)?.takeIf { it.type == CHECK_BOX }
9797
val listIndicator = when (node.type) {
@@ -144,7 +144,7 @@ private fun MarkdownNestedListItem(
144144
content: String,
145145
depth: Int,
146146
markdownComponents: MarkdownComponents,
147-
markdownTypography: MarkdownTypography
147+
markdownTypography: MarkdownTypography,
148148
) {
149149
when (nestedChild.type) {
150150
ORDERED_LIST -> {
@@ -156,6 +156,7 @@ private fun MarkdownNestedListItem(
156156
)
157157
markdownComponents.orderedList.invoke(model)
158158
}
159+
159160
UNORDERED_LIST -> {
160161
val model = MarkdownComponentModel(
161162
content = content,
@@ -165,8 +166,9 @@ private fun MarkdownNestedListItem(
165166
)
166167
markdownComponents.unorderedList.invoke(model)
167168
}
169+
168170
else -> {
169-
handleElement(
171+
MarkdownElement(
170172
node = nestedChild,
171173
components = markdownComponents,
172174
content = content,

multiplatform-markdown-renderer/src/commonMain/kotlin/com/mikepenz/markdown/compose/elements/MarkdownTable.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import com.mikepenz.markdown.annotator.buildMarkdownAnnotatedString
2828
import com.mikepenz.markdown.compose.LocalMarkdownColors
2929
import com.mikepenz.markdown.compose.LocalMarkdownComponents
3030
import com.mikepenz.markdown.compose.LocalMarkdownDimens
31+
import com.mikepenz.markdown.compose.MarkdownElement
3132
import com.mikepenz.markdown.compose.elements.material.MarkdownBasicText
32-
import com.mikepenz.markdown.compose.handleElement
3333
import org.intellij.markdown.MarkdownElementTypes.IMAGE
3434
import org.intellij.markdown.ast.ASTNode
3535
import org.intellij.markdown.ast.findChildOfType
@@ -106,7 +106,7 @@ fun MarkdownTableHeader(
106106
modifier = Modifier.padding(tableCellPadding).weight(1f),
107107
) {
108108
if (cell.children.any { it.type == IMAGE }) {
109-
handleElement(node = cell, components = markdownComponents, content = content, includeSpacer = false)
109+
MarkdownElement(node = cell, components = markdownComponents, content = content, includeSpacer = false)
110110
} else {
111111
MarkdownTableBasicText(
112112
content = content,
@@ -143,7 +143,7 @@ fun MarkdownTableRow(
143143
modifier = Modifier.padding(tableCellPadding).weight(1f),
144144
) {
145145
if (cell.children.any { it.type == IMAGE }) {
146-
handleElement(node = cell, components = markdownComponents, content = content, includeSpacer = false)
146+
MarkdownElement(node = cell, components = markdownComponents, content = content, includeSpacer = false)
147147
} else {
148148
MarkdownTableBasicText(content = content, cell = cell, style = style, maxLines = maxLines, overflow = overflow, annotatorSettings = annotatorSettings)
149149
}

0 commit comments

Comments
 (0)