마크다운 lib 추가, favicon 추가

kimmandoo · Mar 6, 2025 · c44a71a · c44a71a
1 parent 031b522
commit c44a71a
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 280 deletions.
diff --git a/blog/composeApp/build.gradle.kts b/blog/composeApp/build.gradle.kts
@@ -40,6 +40,8 @@ kotlin {
             implementation(compose.components.uiToolingPreview)
             implementation(libs.androidx.lifecycle.viewmodel)
             implementation(libs.androidx.lifecycle.runtime.compose)
+            implementation("com.mikepenz:multiplatform-markdown-renderer-m2:0.31.0")
+            implementation("com.mikepenz:multiplatform-markdown-renderer-code:0.31.0")
         }
     }
 }

diff --git a/blog/composeApp/src/wasmJsMain/kotlin/com/kimmandoo/blog/main.kt b/blog/composeApp/src/wasmJsMain/kotlin/com/kimmandoo/blog/main.kt
@@ -6,6 +6,12 @@ import kotlinx.browser.document
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
+    val link = document.querySelector("link[rel~='icon']")
+    	?: document.createElement("link").apply {
+            setAttribute("rel", "icon")
+        	document.head?.appendChild(this);
+        }
+    link.setAttribute("href", "https://raw.githubusercontent.com/JetBrains/kotlin-web-site/refs/heads/master/assets/images/favicon.ico");
     ComposeViewport(document.body!!) {
         App()
     }

diff --git a/blog/composeApp/src/wasmJsMain/kotlin/com/kimmandoo/blog/screen/AboutScreen.kt b/blog/composeApp/src/wasmJsMain/kotlin/com/kimmandoo/blog/screen/AboutScreen.kt
@@ -12,26 +12,42 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.kimmandoo.blog.markdown.MarkdownText
+import androidx.compose.ui.graphics.Color
 import com.kimmandoo.blog.readFileToString
+import com.mikepenz.markdown.compose.components.markdownComponents
+import com.mikepenz.markdown.compose.elements.MarkdownCodeBlock
+import com.mikepenz.markdown.compose.elements.highlightedCodeBlock
+import com.mikepenz.markdown.compose.elements.highlightedCodeFence
+import com.mikepenz.markdown.compose.extendedspans.ExtendedSpans
+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.m2.Markdown
+import com.mikepenz.markdown.model.markdownExtendedSpans
 
 @Composable
 fun AboutScreen() {
     var markdownContent by remember { mutableStateOf("") }
 
     LaunchedEffect(Unit){
-        markdownContent = readFileToString("/md/aboutme.md")
+        markdownContent = readFileToString("/md/aboutme.md").trimIndent()
         println(markdownContent)
     }
 
     Box(modifier = Modifier.fillMaxSize()){
         SelectionContainer {
-            MarkdownText(markdown = markdownContent.trimIndent())
-//            Text(
-//                text = markdownContent,
-//                style = MaterialTheme.typography.body1
-//            )
+            Markdown(
+                content = markdownContent,
+                extendedSpans = markdownExtendedSpans {
+                    val animator = rememberSquigglyUnderlineAnimator()
+                    remember {
+                        ExtendedSpans(
+                            RoundedCornerSpanPainter(),
+                            SquigglyUnderlineSpanPainter(animator = animator)
+                        )
+                    }
+                }
+            )
         }
     }
 }
diff --git a/blog/composeApp/src/wasmJsMain/resources/favicon.ico b/blog/composeApp/src/wasmJsMain/resources/favicon.ico
diff --git a/docs/021a7f24cb1e620b463e.wasm b/docs/021a7f24cb1e620b463e.wasm
diff --git a/docs/6439a4285ef148a89204.wasm b/docs/6439a4285ef148a89204.wasm
diff --git a/docs/88d24fef424614b157fc.wasm b/docs/88d24fef424614b157fc.wasm
diff --git a/docs/b59bd3d64d8cb3a82a76.wasm b/docs/b59bd3d64d8cb3a82a76.wasm
diff --git a/docs/composeApp.js b/docs/composeApp.js
diff --git a/docs/composeApp.js.map b/docs/composeApp.js.map
diff --git a/docs/drawable/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml b/docs/drawable/compose-multiplatform.xml → ...ources/drawable/compose-multiplatform.xml
diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/index.html b/docs/index.html
@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>kimmandoo</title>
     <link type="text/css" rel="stylesheet" href="styles.css">
-    <script src="main.js?v=1.0.0"></script>
     <script type="application/javascript" src="composeApp.js"></script>
+    <script src="composeApp.js?v=1.0.0"></script>
 </head>
 <body>
 </body>