Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ runs:
steps:
- uses: ./.github/workflows/actions/prepare

- name: Build material-html-text
- name: Build html-text-material
shell: bash
run: ./gradlew :material-html-text:assembleRelease
run: ./gradlew :html-text-material:assembleRelease

- name: Build material3-html-text
- name: Build html-text-material3
shell: bash
run: ./gradlew :material3-html-text:assembleRelease
run: ./gradlew :html-text-material3:assembleRelease

- name: Build sample apps
shell: bash
Expand Down
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,13 @@ $RECYCLE.BIN/
/.idea/artifacts/common_jvm.xml

/.idea/kotlinc.xml
/.idea/artifacts/material_html_text_jvm.xml
/.idea/artifacts/material3_html_text_jvm.xml
/.idea/artifacts/html_text_common_jvm.xml
/.idea/artifacts/html_text_material_jvm.xml
/.idea/artifacts/html_text_material3_jvm.xml
/.idea/inspectionProfiles/Project_Default.xml
/.idea/runConfigurations.xml
/.idea/copilotDiffState.xml

/.idea/markdown.xml
/.idea/migrations.xml
/.idea/misc.xml
10 changes: 0 additions & 10 deletions .idea/misc.xml

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
`HtmlText` is a Kotlin Multiplatform library that allows you to render HTML content as Compose `AnnotatedString`s. It supports basic formatting, hyperlinks, and color styling in a multiplatform-friendly way. `HtmlText` has been made accessible for screen readers and keyboard operation.

> [!WARNING]
> Starting with version 3.0.0-beta01, the Maven GroupId has changed to `de.charlex.compose`
> Starting with version 3.0.0-beta02, the Maven GroupId has changed to `de.charlex.compose` and artifact names changed from `material-html-text` to `html-text-material`.

> [!NOTE]
> 🚀 HtmlText is now Compose Multiplatform
Expand Down Expand Up @@ -56,22 +56,22 @@ Add actual HtmlText library:

```groovy
dependencies {
implementation 'de.charlex.compose:material-html-text:3.0.0-beta01'
implementation 'de.charlex.compose:html-text-material:3.0.0-beta02'
}
```

or

```groovy
dependencies {
implementation 'de.charlex.compose:material3-html-text:3.0.0-beta01'
implementation 'de.charlex.compose:html-text-material3:3.0.0-beta02'
}
```

License
--------

Copyright 2021 Alexander Karkossa
Copyright 2025 Alexander Karkossa

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
21 changes: 0 additions & 21 deletions common/build.gradle.kts

This file was deleted.

47 changes: 47 additions & 0 deletions html-text-common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import de.charlex.convention.config.configureIosTargets

plugins {
id("de.charlex.convention.android.library")
id("de.charlex.convention.kotlin.multiplatform.mobile")
id("de.charlex.convention.centralPublish")
id("de.charlex.convention.compose.multiplatform")
}

mavenPublishConfig {
description = "A Kotlin Multiplatform library to render HTML content as Compose AnnotatedString in Material, supporting basic formatting and hyperlinks."
url = "https://github.com/ch4rl3x/HtmlText"

scm {
connection = "scm:git:github.com/ch4rl3x/HtmlText.git"
developerConnection = "scm:git:ssh://github.com/ch4rl3x/HtmlText.git"
url = "https://github.com/ch4rl3x/HtmlText/tree/main"
}

developers {
developer {
id = "ch4rl3x"
name = "Alexander Karkossa"
email = "alexander.karkossa@googlemail.com"
}
developer {
id = "kalinjul"
name = "Julian Kalinowski"
email = "julakali@gmail.com"
}
}
}

kotlin {
configureIosTargets()
jvm()

sourceSets {
commonMain {
dependencies {
implementation(compose.runtime)
implementation(compose.foundation)
implementation(libs.mohamedrejeb.ksoup.html)
}
}
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ plugins {
}

mavenPublishConfig {
name = "material-html-text"
description = "A Kotlin Multiplatform library to render HTML content as Compose AnnotatedString in Material, supporting basic formatting and hyperlinks."
url = "https://github.com/ch4rl3x/HtmlText"

Expand Down Expand Up @@ -45,7 +44,7 @@ kotlin {
implementation(compose.material)
implementation(compose.components.resources)

implementation(project(":common"))
implementation(project(":html-text-common"))
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ 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.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextLayoutResult
Expand All @@ -22,7 +21,6 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.sp
import de.charlex.compose.htmltext.core.htmlToAnnotatedString
import kotlin.Int

/**
* Simple Text composable to show the text with html styling from string resources.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ plugins {
}

mavenPublishConfig {
name = "material3-html-text"
description = "A Kotlin Multiplatform library to render HTML content as Compose AnnotatedString in Material 3, supporting basic formatting and hyperlinks."
url = "https://github.com/ch4rl3x/HtmlText"

Expand Down Expand Up @@ -44,7 +43,7 @@ kotlin {
implementation(compose.material3)
implementation(compose.components.resources)

implementation(project(":common"))
implementation(projects.htmlTextCommon)
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions sample-app/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ kotlin {
implementation(compose.material)
implementation(compose.material3)

implementation(project(":material-html-text"))
implementation(project(":material3-html-text"))
implementation(projects.htmlTextMaterial)
implementation(projects.htmlTextMaterial3)
}
}
}
Expand All @@ -37,5 +37,3 @@ kotlin {
}
}
}


8 changes: 5 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ dependencyResolutionManagement {
}
}
rootProject.name = "HtmlText"
include(":material-html-text")
include(":material3-html-text")
include(":common")
include(':html-text-material')
include(':html-text-material3')
include(':html-text-common')
include(":sample-app:shared")
include(":sample-app:android-app")

enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
Loading