Merge branch 'main' into release

Author: ShreckYe

.gitignore

@@ -3,3 +3,5 @@ build
 local.properties
 
 .idea
+
+xcuserdata/

README.md

@@ -1,31 +1,29 @@
-# Compose Multiplatform Material wrappers
+# Compose Multiplatform Material wrappers for `androidx.compose.material` and Compose HTML
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.huanshankeji/compose-multiplatform-material)](https://search.maven.org/artifact/com.huanshankeji/compose-multiplatform-material)
+[![Maven Central](https://img.shields.io/maven-central/v/com.huanshankeji/compose-multiplatform-material)](https://search.maven.org/search?q=g:com.huanshankeji%20AND%20a:compose-multiplatform-*)
 ![Kotlin version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=com.huanshankeji&name=compose-multiplatform-material)
 
-Some simple Compose Multiplatform wrappers of common components, layouts, and Material Design components for Android/desktop/iOS (those in `androidx.compose.material`) and Compose HTML (mainly based on [KMDC](https://github.com/mpetuska/kmdc))
+Some simple unified Compose Multiplatform wrappers of common components, layouts, and Material Design components for `androidx.compose.material` (officially supported on Android, desktop (JVM), iOS, web (Kotlin/Wasm)) and Compose HTML (mainly based on [Kobweb Silk](https://github.com/varabyte/kobweb?tab=readme-ov-file#silk) and [KMDC](https://github.com/mpetuska/kmdc))
 
-We try to make the function types of the composable components follow those of the desktop and Android ones
-in `androidx.compose.foundation` and `androidx.compose.material`, meanwhile being compatible with the Compose HTML APIs. However,
-only subsets of the composables and composable arguments are supported due to the API differences, limitations of the
-Compose HTML composables this project depends on, and our limited effort.
+<!-- a set of APIs for Compose HTML similar to those in `androidx.compose.material` -->
+
+We try to make the function types of the composable components follow those in `androidx.compose.foundation` and `androidx.compose.material`, meanwhile being compatible with the Compose HTML APIs. However, only subsets of the composables and composable arguments are supported due to the API differences, limitations of the Compose HTML composables this project depends on, and our limited effort.
 
 Visual consistency across different platforms is not guaranteed.
 
 This project is prototype and there is no documentation yet. Check out [the demo project](demo) on how to use the components.
 
-<!--
-There is no plan to support Apple platforms until there is official support from [Compose Multiplatform](https://github.com/JetBrains/compose-jb). Check out <https://github.com/cl3m/multiplatform-compose> for some experiments and prototypes on supporting iOS with Compose Multiplatform.
--->
-
 ## Supported features
 
 ### Components
 
 #### Common (Foundation) components
 
 - `BasicText`
-- `RawText`
+
+##### `ext` components
+
+- `InlineBasicText`
 
 ##### Layouts
 
@@ -41,9 +39,14 @@ There is no plan to support Apple platforms until there is official support from
 - `IconButton`
 - `ScrollableList`/`LazyColumn` (visually inconsistent for now)
 - `Text`/`MaterialText`
+- `TextField`
 - `TopAppBarScaffold`
 
-### Styles
+#### Components in the `ext` packages
+
+The components in the `ext` packages don't follow the `androidx.compose` APIs exactly, but rather provide wrappers are idiomatic and conventional on both kinds of targets, wrapping different APIs which can't be unified following the `androidx.compose` APIs.
+
+### Styles (obsolete in the legacy module, for removal)
 
 The `ModifierOrAttrsScope.styles` function and the `StyleScope` class provide a universal interface for `Modifier`s and CSS styles.
 
@@ -55,3 +58,46 @@ The functions in `StyleScope`:
 - `backgroundColor`
 - `platformBorder`
 - `outerBorder`
+
+### Modifiers
+
+- size modifiers
+   - `size`, `sizeIn`, `fillMaxSize`
+   - `width`, `widthIn`, `fillMaxWidth`
+   - `height`, `heightIn`, `fillMaxHeight`
+- `padding`
+- `background`
+- `border` (visually inconsistent)
+
+#### `ext` modifiers
+
+- `outerBorder`
+- `roundedCornerBackgroundAndOuterBorder`
+
+## Add the libraries to your dependency
+
+Maven coordinate:
+
+```kotlin
+"com.huanshankeji:compose-multiplatform-$module:$version"
+```
+
+View [all the artifacts on Maven Central](https://search.maven.org/search?q=g:com.huanshankeji%20AND%20a:compose-multiplatform-*).
+
+This project depends on [Kobweb](https://github.com/varabyte/kobweb) which is not published to Maven Central yet, so you have to add the following Maven repository:
+
+```kotlin
+repositories {
+    maven("https://us-central1-maven.pkg.dev/varabyte-repos/public")
+}
+```
+
+## About Kobweb Silk
+
+The Kotlin/JS (Compose HTML) portion of this project depends on [Kobweb Compose](https://github.com/varabyte/kobweb/blob/main/frontend/kobweb-compose/README.md) of [Kobweb Silk](https://github.com/varabyte/kobweb?tab=readme-ov-file#silk) which is a UI layer built upon Compose HTML that provides `Modifier` APIs (type-safe CSS API wrappers) and layouts. Here is a list of topics in their README.md that should be helpful when you use this library in Compose HTML:
+
+1. [Silk](https://github.com/varabyte/kobweb?tab=readme-ov-file#silk)
+   1. [Modifier](https://github.com/varabyte/kobweb?tab=readme-ov-file#modifier) 
+      1. [attrsModifier and styleModifier](https://github.com/varabyte/kobweb?tab=readme-ov-file#attrsmodifier-and-stylemodifier) 
+1. [General purpose improvements on top of Compose HTML and Kotlin/JS](https://github.com/varabyte/kobweb?tab=readme-ov-file#general-purpose-improvements-on-top-of-compose-html-and-kotlinjs)
+1. [What about Compose Multiplatform for Web?](https://github.com/varabyte/kobweb?tab=readme-ov-file#what-about-compose-multiplatform-for-web)

buildSrc/build.gradle.kts

@@ -5,12 +5,14 @@ plugins {
 repositories {
     //mavenLocal()
     gradlePluginPortal()
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     google()
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    mavenCentral()
 }
 
 dependencies {
     implementation(kotlin("gradle-plugin", "1.9.23"))
     implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.1")
     implementation("com.huanshankeji.team:gradle-plugins:0.5.1")
+    implementation("com.android.tools.build:gradle:8.2.2")
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -1,4 +1,14 @@
+val projectVersion = "0.2.0-SNAPSHOT"
+
 object DependencyVersions {
+    val composeMultiplatform = "1.6.1" // manually specified for "ui-unit"
+    val kobweb = "0.17.1"
     val huanshankejiComposeWeb = "0.2.2"
     val kmdc = "0.1.2"
+    val materialIcons = "1.13.12"
+
+    object Androidx {
+        val activityCompose = "1.8.2"
+        val compose = "1.6.4"
+    }
 }

buildSrc/src/main/kotlin/common-conventions.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
@@ -6,12 +8,31 @@ plugins {
 repositories {
     mavenLocal()
     mavenCentral()
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     google()
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    maven("https://us-central1-maven.pkg.dev/varabyte-repos/public") // for Kobweb
 }
 
+group = "com.huanshankeji"
+version = projectVersion
+
 kotlin {
+    // for `androidx.compose`
+
     jvm() // TODO: `jvm("desktop")`?
-    // TODO: `android()`?
-    js(IR)
+    jvmToolchain(8)
+
+    //androidTarget()
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs()
+
+
+    // for JS and HTML wrappers
+
+    js()
 }

buildSrc/src/main/kotlin/lib-conventions.gradle.kts

@@ -1,9 +1,33 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     id("common-conventions")
     // TODO: `id("com.android.library") version "7.2.2"`?
     id("com.huanshankeji.kotlin-multiplatform-jvm-and-js-browser-conventions")
     id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
+    //id("com.android.library") // not used yet, the `jvm` target seems to be enough
 }
 
-group = "com.huanshankeji"
-version = "0.1.2"
+kotlin {
+    // move to `common-conventions` if necessary
+
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    applyDefaultHierarchyTemplate {
+        common {
+            group("androidxCommon") {
+                withJvm()
+                group("ios")
+                withWasm()
+            }
+        }
+    }
+
+    /*
+    sourceSets {
+        val androidxCommonMain by creating { dependsOn(commonMain.get()) }
+        jvmMain { dependsOn(androidxCommonMain) }
+        iosMain { dependsOn(androidxCommonMain) }
+        named("wasmJsMain") { dependsOn(androidxCommonMain) }
+    }
+    */
+}

compose-multiplatform-common/build.gradle.kts

@@ -7,22 +7,37 @@ plugins {
 
 kotlin {
     sourceSets {
-        named("commonMain") {
+        /*
+        Use `api`. See:
+        https://github.com/JetBrains/compose-multiplatform-core/blob/jb-main/compose/foundation/foundation/build.gradle
+        https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/compose/foundation/foundation/build.gradle
+        */
+        commonMain {
             dependencies {
-                implementation(compose.runtime)
+                api(compose.runtime)
                 //compileOnly(compose.foundation) // for KDoc element links only
+                /*
+                The units from Compose are used directly.
+                This is an ideal dependency whose APIs should be exposed and shared on all platforms including JS
+                therefore we don't need to create wrappers for them,
+                because a depending `ui-graphics` module would be too much as it depends on `skiko`,
+                and more such as `ui` and `ui-text` depend on `ui-graphics`.
+                A dependency of `ui-unit` is `ui-geometry` which might be useful too.
+                */
+                api("org.jetbrains.compose.ui:ui-unit:${DependencyVersions.composeMultiplatform}")
+                implementation("org.jetbrains.compose.annotation-internal:annotation:${DependencyVersions.composeMultiplatform}")
             }
         }
-        named("jvmMain") {
+        androidxCommonMain {
             dependencies {
-                implementation(compose.foundation)
+                api(compose.foundation)
             }
         }
-        named("jsMain") {
+        jsMain {
             dependencies {
-                implementation(compose.html.core)
-
-                api("com.huanshankeji:compose-web-common:${DependencyVersions.huanshankejiComposeWeb}")
+                api(compose.html.core)
+                // see: https://github.com/varabyte/kobweb/blob/main/frontend/kobweb-compose/build.gradle.kts
+                api("com.varabyte.kobweb:kobweb-compose:${DependencyVersions.kobweb}")
             }
         }
     }

compose-multiplatform-common/legacy/build.gradle.kts

@@ -0,0 +1,41 @@
+import com.huanshankeji.team.`Shreck Ye`
+import com.huanshankeji.team.pomForTeamDefaultOpenSource
+
+plugins {
+    `lib-conventions`
+}
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(compose.runtime)
+                //compileOnly(compose.foundation) // for KDoc element links only
+            }
+        }
+        androidxCommonMain {
+            dependencies {
+                api(compose.foundation)
+            }
+        }
+        jsMain {
+            dependencies {
+                implementation(compose.html.core)
+
+                api("com.huanshankeji:compose-web-common:${DependencyVersions.huanshankejiComposeWeb}")
+            }
+        }
+    }
+}
+
+publishing.publications.withType<MavenPublication> {
+    pomForTeamDefaultOpenSource(
+        project,
+        "Legacy Compose Multiplatform common wrappers",
+        "Legacy common wrappers of components (including layouts) and styles for Compose Multiplatform on (desktop/Android and web)\n" +
+                "This legacy module depends on `com.huanshankeji:compose-web-common` instead of Kobweb Silk " +
+                "and its components use the `ModifierOrAttrsScope` class to configure styles."
+    ) {
+        `Shreck Ye`()
+    }
+}