From 0eed9d4c348bafea9b2c3afd7250a857ea4d77b6 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Fri, 8 May 2026 22:53:38 +0200 Subject: [PATCH 1/2] new markdown lib (com.mikepenz) --- app/build.gradle.kts | 4 +++- .../wiiznokes/gitnote/ui/screen/app/edit/MarkDown.kt | 7 +++---- gradle/libs.versions.toml | 6 ++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ca196d..04f9063 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -181,7 +181,9 @@ dependencies { implementation(libs.reimagined.navigation) // Markdown - implementation(libs.compose.markdown) + implementation(libs.compose.markdown.core) + implementation(libs.compose.markdown.renderer) + implementation(libs.compose.markdown.android) // unit test testImplementation(kotlin("test")) diff --git a/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/edit/MarkDown.kt b/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/edit/MarkDown.kt index 709ce1d..ed17109 100644 --- a/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/edit/MarkDown.kt +++ b/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/edit/MarkDown.kt @@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.unit.dp -import dev.jeziellago.compose.markdowntext.MarkdownText +import com.mikepenz.markdown.m3.Markdown import io.github.wiiznokes.gitnote.ui.viewmodel.edit.MarkDownVM @Composable @@ -46,11 +46,10 @@ fun MarkDownContent( .fillMaxSize() .verticalScroll(rememberScrollState()) ) { - MarkdownText( + Markdown( modifier = Modifier .padding(15.dp), - markdown = textContent.text, - isTextSelectable = true, + content = textContent.text, ) } } else { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 11da765..9c6b572 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ compose-bom = "2026.05.00" room = "2.8.4" sqlite = "3.49.0" paging = "3.5.0" -compose-markdown = "0.5.8" +compose-markdown = "0.40.2" # todo: remove this dep and use the standard one reimagined-navigation = "1.5.0" @@ -50,7 +50,9 @@ room-paging = { group = "androidx.room", name = "room-paging", version.ref = "ro # Markdown -compose-markdown = { group = "com.github.jeziellago", name = "compose-markdown", version.ref = "compose-markdown" } +compose-markdown-core = { group = "com.mikepenz", name = "multiplatform-markdown-renderer", version.ref = "compose-markdown" } +compose-markdown-renderer = { group = "com.mikepenz", name = "multiplatform-markdown-renderer-m3", version.ref = "compose-markdown" } +compose-markdown-android = { group = "com.mikepenz", name = "multiplatform-markdown-renderer-android", version.ref = "compose-markdown" } # 3-party reimagined-navigation = { group = "dev.olshevski.navigation", name = "reimagined", version.ref = "reimagined-navigation" } From 78f52eef659d2d5fff341a8c37310f62bdad7afe Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Fri, 8 May 2026 22:56:12 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f8fba7..c01540d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### Changed + +- new markdown rendering lib. Made in compose. + +### Added + +- popup when leaving the edit of a note without saving + ## [26.01] ### Changed @@ -38,8 +46,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed - optimization for big repo - - use fts in libsql - - use a padger (only load notes visibles) + - use fts in libsql + - use a padger (only load notes visibles) ### Added