Merge pull request #339 from mikepenz/feature/337

Add option to make EOL be a new line (for direct APIs)

Author: mikepenz

app-desktop/src/jvmMain/kotlin/main.kt

@@ -4,8 +4,18 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
+import androidx.compose.material.contentColorFor
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
@@ -216,8 +226,8 @@ Title 1
 Title 2
 ------
               
-[https://mikepenz.dev](https://mikepenz.dev)
-[https://github.com/mikepenz](https://github.com/mikepenz)
-[Mike Penz's Blog](https://blog.mikepenz.dev/)
-<https://blog.mikepenz.dev/>
+[https://mikepenz.dev](https://mikepenz.dev)  
+[https://github.com/mikepenz](https://github.com/mikepenz)  
+[Mike Penz's Blog](https://blog.mikepenz.dev/)  
+<https://blog.mikepenz.dev/>  
 """

app-wasm/src/wasmJsMain/kotlin/Main.kt

@@ -1,4 +1,3 @@
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
@@ -21,10 +20,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.CanvasBasedWindow
-import coil3.compose.AsyncImage
-import coil3.compose.LocalPlatformContext
-import coil3.compose.rememberAsyncImagePainter
-import coil3.request.ImageRequest
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
 import com.mikepenz.aboutlibraries.ui.compose.m3.LibraryDefaults
@@ -37,7 +32,6 @@ import com.mikepenz.markdown.compose.extendedspans.RoundedCornerSpanPainter
 import com.mikepenz.markdown.compose.extendedspans.SquigglyUnderlineSpanPainter
 import com.mikepenz.markdown.compose.extendedspans.rememberSquigglyUnderlineAnimator
 import com.mikepenz.markdown.m3.Markdown
-import com.mikepenz.markdown.model.ImageData
 import com.mikepenz.markdown.model.markdownExtendedSpans
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 
@@ -205,8 +199,8 @@ Title 1
 Title 2
 ------
               
-[https://mikepenz.dev](https://mikepenz.dev)
-[https://github.com/mikepenz](https://github.com/mikepenz)
-[Mike Penz's Blog](https://blog.mikepenz.dev/)
-<https://blog.mikepenz.dev/>
+[https://mikepenz.dev](https://mikepenz.dev)  
+[https://github.com/mikepenz](https://github.com/mikepenz)  
+[Mike Penz's Blog](https://blog.mikepenz.dev/)  
+<https://blog.mikepenz.dev/>  
 """

app/src/main/kotlin/com/mikepenz/markdown/MainActivity.kt

@@ -185,8 +185,8 @@ Title 1
 Title 2
 ------
               
-[https://mikepenz.dev](https://mikepenz.dev)
-[https://github.com/mikepenz](https://github.com/mikepenz)
-[Mike Penz's Blog](https://blog.mikepenz.dev/)
-<https://blog.mikepenz.dev/>
+[https://mikepenz.dev](https://mikepenz.dev)  
+[https://github.com/mikepenz](https://github.com/mikepenz)  
+[Mike Penz's Blog](https://blog.mikepenz.dev/)  
+<https://blog.mikepenz.dev/>  
 """

app/src/screenshotTest/kotlin/com/mikepenz/markdown/ui/m2/SnapshotTests.kt

@@ -129,10 +129,10 @@ Title 1
 Title 2
 ------
               
-[https://mikepenz.dev](https://mikepenz.dev)
-[https://github.com/mikepenz](https://github.com/mikepenz)
-[Mike Penz's Blog](https://blog.mikepenz.dev/)
-<https://blog.mikepenz.dev/>
+[https://mikepenz.dev](https://mikepenz.dev)  
+[https://github.com/mikepenz](https://github.com/mikepenz)  
+[Mike Penz's Blog](https://blog.mikepenz.dev/)  
+<https://blog.mikepenz.dev/>  
 """.trimIndent()
 
 

app/src/screenshotTest/kotlin/com/mikepenz/markdown/ui/m3/SnapshotTests.kt

@@ -129,10 +129,10 @@ Title 1
 Title 2
 ------
               
-[https://mikepenz.dev](https://mikepenz.dev)
-[https://github.com/mikepenz](https://github.com/mikepenz)
-[Mike Penz's Blog](https://blog.mikepenz.dev/)
-<https://blog.mikepenz.dev/>
+[https://mikepenz.dev](https://mikepenz.dev)  
+[https://github.com/mikepenz](https://github.com/mikepenz)  
+[Mike Penz's Blog](https://blog.mikepenz.dev/)  
+<https://blog.mikepenz.dev/>  
 """.trimIndent()
 
 

multiplatform-markdown-renderer/api/android/multiplatform-markdown-renderer.api

@@ -13,23 +13,23 @@ public final class com/mikepenz/markdown/annotator/AnnotatedStringKtxKt {
 public abstract interface class com/mikepenz/markdown/annotator/AnnotatorSettings {
 	public abstract fun getAnnotator ()Lcom/mikepenz/markdown/model/MarkdownAnnotator;
 	public abstract fun getCodeSpanStyle ()Landroidx/compose/ui/text/SpanStyle;
+	public abstract fun getEolAsNewLine ()Z
 	public abstract fun getLinkInteractionListener ()Landroidx/compose/ui/text/LinkInteractionListener;
 	public abstract fun getLinkTextSpanStyle ()Landroidx/compose/ui/text/TextLinkStyles;
 	public abstract fun getReferenceLinkHandler ()Lcom/mikepenz/markdown/model/ReferenceLinkHandler;
 }
 
 public final class com/mikepenz/markdown/annotator/AnnotatorSettingsKt {
-	public static final fun annotatorSettings (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/platform/UriHandler;Landroidx/compose/ui/text/LinkInteractionListener;Landroidx/compose/runtime/Composer;II)Lcom/mikepenz/markdown/annotator/AnnotatorSettings;
+	public static final fun annotatorSettings (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/platform/UriHandler;Landroidx/compose/ui/text/LinkInteractionListener;ZLandroidx/compose/runtime/Composer;II)Lcom/mikepenz/markdown/annotator/AnnotatorSettings;
 }
 
 public final class com/mikepenz/markdown/annotator/DefaultAnnotatorSettings : com/mikepenz/markdown/annotator/AnnotatorSettings {
 	public static final field $stable I
-	public fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;)V
-	public synthetic fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;)V
-	public synthetic fun <init> (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;Z)V
+	public synthetic fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getAnnotator ()Lcom/mikepenz/markdown/model/MarkdownAnnotator;
 	public fun getCodeSpanStyle ()Landroidx/compose/ui/text/SpanStyle;
+	public fun getEolAsNewLine ()Z
 	public fun getLinkInteractionListener ()Landroidx/compose/ui/text/LinkInteractionListener;
 	public fun getLinkTextSpanStyle ()Landroidx/compose/ui/text/TextLinkStyles;
 	public fun getReferenceLinkHandler ()Lcom/mikepenz/markdown/model/ReferenceLinkHandler;

multiplatform-markdown-renderer/api/jvm/multiplatform-markdown-renderer.api

@@ -13,23 +13,23 @@ public final class com/mikepenz/markdown/annotator/AnnotatedStringKtxKt {
 public abstract interface class com/mikepenz/markdown/annotator/AnnotatorSettings {
 	public abstract fun getAnnotator ()Lcom/mikepenz/markdown/model/MarkdownAnnotator;
 	public abstract fun getCodeSpanStyle ()Landroidx/compose/ui/text/SpanStyle;
+	public abstract fun getEolAsNewLine ()Z
 	public abstract fun getLinkInteractionListener ()Landroidx/compose/ui/text/LinkInteractionListener;
 	public abstract fun getLinkTextSpanStyle ()Landroidx/compose/ui/text/TextLinkStyles;
 	public abstract fun getReferenceLinkHandler ()Lcom/mikepenz/markdown/model/ReferenceLinkHandler;
 }
 
 public final class com/mikepenz/markdown/annotator/AnnotatorSettingsKt {
-	public static final fun annotatorSettings (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/platform/UriHandler;Landroidx/compose/ui/text/LinkInteractionListener;Landroidx/compose/runtime/Composer;II)Lcom/mikepenz/markdown/annotator/AnnotatorSettings;
+	public static final fun annotatorSettings (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/platform/UriHandler;Landroidx/compose/ui/text/LinkInteractionListener;ZLandroidx/compose/runtime/Composer;II)Lcom/mikepenz/markdown/annotator/AnnotatorSettings;
 }
 
 public final class com/mikepenz/markdown/annotator/DefaultAnnotatorSettings : com/mikepenz/markdown/annotator/AnnotatorSettings {
 	public static final field $stable I
-	public fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;)V
-	public synthetic fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;)V
-	public synthetic fun <init> (Landroidx/compose/ui/text/TextStyle;Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;Z)V
+	public synthetic fun <init> (Landroidx/compose/ui/text/TextLinkStyles;Landroidx/compose/ui/text/SpanStyle;Lcom/mikepenz/markdown/model/MarkdownAnnotator;Lcom/mikepenz/markdown/model/ReferenceLinkHandler;Landroidx/compose/ui/text/LinkInteractionListener;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getAnnotator ()Lcom/mikepenz/markdown/model/MarkdownAnnotator;
 	public fun getCodeSpanStyle ()Landroidx/compose/ui/text/SpanStyle;
+	public fun getEolAsNewLine ()Z
 	public fun getLinkInteractionListener ()Landroidx/compose/ui/text/LinkInteractionListener;
 	public fun getLinkTextSpanStyle ()Landroidx/compose/ui/text/TextLinkStyles;
 	public fun getReferenceLinkHandler ()Lcom/mikepenz/markdown/model/ReferenceLinkHandler;