Merge pull request #34 from NeoUtils/web-target

Release v2.2.0 - Web target

README.md

@@ -13,7 +13,7 @@ Facilitate the creation of dynamic highlights using regular expressions, ideal f
 | Android with Jetpack Compose | ✅       |
 | Android with View            | ✅       |
 | Compose for Desktop          | ✅       |
-| Compose for Web              | ❌       |
+| Compose for Web              | ✅       |
 | Compose for iOS              | ❌       |
 
 ## Quick Start

build-logic/src/main/kotlin/com.neoutils.android-library.gradle.kts

@@ -1,14 +1,25 @@
-import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
-import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.SonatypeHost
 import extension.config
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.vanniktech.maven.publish")
     id("com.android.library")
     kotlin("multiplatform")
 }
 
+kotlin {
+    sourceSets {
+        androidTarget {
+            compilerOptions {
+                jvmTarget.set(
+                    JvmTarget.JVM_1_8
+                )
+            }
+        }
+    }
+}
+
 android {
     compileSdk = config.android.compileSdk
 

build-logic/src/main/kotlin/extension/Project.kt

@@ -5,7 +5,7 @@ import model.Config
 val config = Config(
     version = Config.Version(
         major = 2,
-        minor = 1,
+        minor = 2,
         patch = 0,
         release = Config.Release.Definitive
     ),

build.gradle.kts

@@ -1,9 +1,18 @@
 plugins {
+    // android
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.android.application) apply false
+
+    // kotlin
+    alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.js) apply false
+
+    // compose
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.jetbrains.compose) apply false
+
+    // publish
     alias(libs.plugins.mavenPublish) apply false
 }

example/compose/src/main/java/com/neoutils/highlight/example/compose/example/CodeHighlightExample.kt

@@ -18,14 +18,6 @@ import com.neoutils.highlight.compose.remember.rememberTextFieldValue
 import com.neoutils.highlight.core.extension.textColor
 import com.neoutils.highlight.core.util.UiColor
 import com.neoutils.highlight.example.compose.R
-import org.intellij.lang.annotations.Language
-
-@Language("kotlin")
-private val code = """
-    fun main() {
-        print("Hello, World!")
-    }
-""".trimIndent()
 
 @Composable
 fun CodeHighlightExample(modifier: Modifier = Modifier) {
@@ -58,7 +50,15 @@ fun CodeHighlightExample(modifier: Modifier = Modifier) {
     val textFieldValue = rememberSaveable(
         stateSaver = TextFieldValue.Saver
     ) {
-        mutableStateOf(TextFieldValue(code))
+        mutableStateOf(
+            TextFieldValue(
+                """
+                    fun main() {
+                        print("Hello, World!")
+                    }
+                """.trimIndent()
+            )
+        )
     }
 
     BasicTextField(

example/compose/src/main/java/com/neoutils/highlight/example/compose/launcher/CodeHighlightExample.kt

@@ -8,13 +8,10 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.*
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.neoutils.highlight.compose.remember.rememberHighlight
-import com.neoutils.highlight.core.extension.textColor
 import com.neoutils.highlight.example.compose.R
 import com.neoutils.highlight.example.compose.example.CodeHighlightExample
 import com.neoutils.highlight.example.compose.theme.ExampleTheme

example/desktop/src/main/kotlin/Main.kt

@@ -1,37 +1,52 @@
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
+import com.neoutils.highlight.compose.extension.spanStyle
 import com.neoutils.highlight.compose.remember.rememberHighlight
 import com.neoutils.highlight.compose.remember.rememberTextFieldValue
 import com.neoutils.highlight.core.extension.textColor
-import com.neoutils.highlight.core.utils.UiColor
+import com.neoutils.highlight.core.util.Match
+import com.neoutils.highlight.core.util.UiColor
 
 @Composable
 @Preview
 fun App() {
     var textFieldValue by remember {
-        mutableStateOf(TextFieldValue("Hello, World!"))
+        mutableStateOf(TextFieldValue("name = Highlight"))
     }
 
     BasicTextField(
         value = rememberHighlight {
             textColor {
-                fully(
-                    regex = "[A-Z][a-z]+",
-                    UiColor.Blue
+                match(
+                    regex = "(\\w+)\\s*=\\s*(\\w+)".toRegex(),
+                    match = Match.groups(
+                        UiColor.Blue,
+                        UiColor.Red
+                    )
                 )
-                fully(
-                    regex = "\\W",
-                    UiColor.Red
+            }
+
+            spanStyle {
+                match(
+                    regex = "\\bHighlight\\b".toRegex(),
+                    match = Match.fully(
+                        SpanStyle(
+                            fontStyle = FontStyle.Italic
+                        )
+                    )
                 )
             }
         }.rememberTextFieldValue(
@@ -43,7 +58,9 @@ fun App() {
         textStyle = TextStyle(
             fontSize = 16.sp
         ),
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier
+            .padding(8.dp)
+            .fillMaxSize()
     )
 }
 
@@ -52,8 +69,8 @@ fun main() = application {
         title = "Desktop example",
         onCloseRequest = ::exitApplication,
         state = rememberWindowState(
-            width = 400.dp,
-            height = 300.dp
+            width = 600.dp,
+            height = 400.dp
         )
     ) {
         App()

example/web/.gitignore

@@ -0,0 +1 @@
+/build

example/web/build.gradle.kts

@@ -0,0 +1,52 @@
+plugins {
+    alias(libs.plugins.kotlin.js)
+    alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.compose.compiler)
+}
+
+group = "com.neoutils.highlight.example"
+version = "1.0.0"
+
+kotlin {
+    js(IR) {
+
+        moduleName = "app"
+
+        browser {
+            commonWebpackConfig {
+                outputFileName = "app.js"
+            }
+        }
+
+        binaries.executable()
+    }
+}
+
+dependencies {
+
+    implementation(project(":highlight:compose"))
+
+    implementation(compose.runtime)
+    implementation(compose.foundation)
+    implementation(compose.ui)
+    implementation(compose.material3)
+}
+
+repositories {
+
+    google()
+    mavenCentral()
+
+    maven {
+        url = uri("https://central.sonatype.com/api/v1/publisher/deployments/download/")
+
+        credentials(HttpHeaderCredentials::class) {
+            name = "Authorization"
+            value = "Bearer ${findProperty("mavenCentralToken")}"
+        }
+
+        authentication {
+            create<HttpHeaderAuthentication>("header")
+        }
+    }
+}