diff --git a/README.md b/README.md index 92a2c097..f3414788 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,27 @@ -# Compose Multiplatform Material (better name pending): unified Compose Multiplatform common extensions and Material wrappers for `androidx.compose` and Compose HTML +# Compose Multiplatform HTML Unified -[![Maven Central](https://img.shields.io/maven-central/v/com.huanshankeji/compose-multiplatform-material3)](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-material3) +[![Maven Central](https://img.shields.io/maven-central/v/com.huanshankeji/compose-multiplatform-html-unified-common)](https://search.maven.org/search?q=g:com.huanshankeji%20AND%20a:compose-multiplatform-html-unified-*) +![Kotlin version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=com.huanshankeji&name=compose-multiplatform-html-unified-common) -Unified Compose Multiplatform wrappers of common components, layouts, and Material Design components for `androidx.compose` (officially supported on Android, desktop (JVM), iOS, and web (Kotlin/Wasm)) and Compose HTML (mainly based on [Kobweb Silk](https://github.com/varabyte/kobweb?tab=readme-ov-file#silk) [Compose](https://github.com/varabyte/kobweb/tree/main/frontend/kobweb-compose), [KMDC](https://github.com/mpetuska/kmdc), and [Compose HTML Material](https://github.com/huanshankeji/compose-html-material) (which is then based on [Material Web](https://github.com/material-components/material-web))) +Unified Compose Multiplatform wrappers of common and **Material Design** APIs for **rendering-based Compose UI** (officially supported on Android, desktop (JVM), iOS, and web (Kotlin/Wasm)) and **DOM-based Compose HTML** -We try to provide a set of common extensions and composable component APIs akin to those in `androidx.compose` (`androidx.compose.foundation`, `androidx.compose.material`, and `androidx.compose.material3`), meanwhile making them compatible with the Compose HTML APIs. However, only subsets of the composables and composable parameters are supported due to the API differences, limitations of the JS (web) platform and the Compose HTML composables this project depends on, and our limited effort. +This library was previously named "Compose Multiplatform Material". -Complete visual consistency across different platforms is not guaranteed. See the [the side-by-side demo site](https://huanshankeji.github.io/compose-multiplatform-material/) for the visual effects and their differences. +## The scope and implementations of the APIs provided -This project is still in development and has not reached the stable state yet. Some APIs are likely to be changed and there is no detailed documentation yet. Check out [the demo project source](demo) on how to use the components in addition to the information below. +We try to provide a set of common APIs including composable component APIs akin to those in `androidx.compose` (`androidx.compose.foundation`, `androidx.compose.material`, and `androidx.compose.material3`), meanwhile making them compatible with the Compose HTML APIs. However, only subsets of the composables and composable parameters are supported due to the underlying API differences, limitations of the JS platform and the available Compose HTML composables this project depends on, and our limited effort. -## Supported features +The modules of this library correspond to the Compose Multiplatform modules (or Compose modules in AndroidX) that are not available for Compose HTML, aka those that depend on [the UI module](https://github.com/JetBrains/compose-multiplatform-core/tree/jb-main/compose/ui), more specifically [`ui-graphics`](https://github.com/JetBrains/compose-multiplatform-core/tree/jb-main/compose/ui/ui-graphics). The `common` module of this library corresponds to the `ui` and `foundation` modules, offering UI components (including layouts), modifiers, UI configuration classes, etc. + +The Compose HTML / JS DOM source is mainly based on [Kobweb Silk](https://github.com/varabyte/kobweb?tab=readme-ov-file#silk) [Compose](https://github.com/varabyte/kobweb/tree/main/frontend/kobweb-compose), [KMDC](https://github.com/mpetuska/kmdc), and [Compose HTML Material](https://github.com/huanshankeji/compose-html-material) (which is then based on [Material Web](https://github.com/material-components/material-web)). + +## References and limitations + +Complete visual consistency across different platforms is not guaranteed. See [the side-by-side demo site](https://huanshankeji.github.io/compose-multiplatform-material/) for the visual effects and their differences. + +This project is still in development and has not reached a stable state. Some APIs are subject to change and there is no detailed documentation yet. Check out [the demo project source](demo) on how to use the components in addition to the sections below. + +## Supported API catalog ### Components @@ -32,7 +42,7 @@ This project is still in development and has not reached the stable state yet. S ###### `ext` layouts - - `BoxWithConstraints` +- `BoxWithConstraints` ##### Lazy @@ -82,7 +92,7 @@ This project is still in development and has not reached the stable state yet. S - `Button` (`FilledButton`), `ElevatedButton`, `FilledTonalButton`, `OutlinedButton`, `TextButton` - `Card` (`FilledCard`), `ElevatedCard`, `OutlinedCard` - `DropdownMenu`, `DropdownMenuItem` - - `ExposedDropdownMenuBox`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenuBoxTextField`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenu`, `ExposedDropdownMenuWithTextField` + - `ExposedDropdownMenuBox`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenuBoxTextField`, `ExposedDropdownMenuBoxScope.ExposedDropdownMenu`, `ExposedDropdownMenuWithTextField` - `FloatingActionButton`, `SmallFloatingActionButton`, `LargeFloatingActionButton`, `ExtendedFloatingActionButton` - `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`, `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton` - `NavigationBar`, `NavigationBarItem` @@ -95,11 +105,11 @@ This project is still in development and has not reached the stable state yet. S #### About `ext` components (components in the `ext` packages) -The components in the `ext` packages don't follow the `androidx.compose` APIs exactly, but rather provide wrappers are more idiomatic and conventional on both kinds of targets, wrapping different APIs which can't be unified following the `androidx.compose` APIs. +The components in the `ext` packages don't follow the `androidx.compose` APIs exactly, but rather provide wrappers that are more idiomatic and conventional on both kinds of targets, wrapping different APIs that can't be unified following the `androidx.compose` APIs. #### About parameter names -The parameter names with suffixes such as "JsDom" or "AndroidxCommon" are platform-specific, and only apply on their respective platform(s), Compose HTML / JS DOM or +The parameter names with suffixes such as "JsDom" or "ComposeUi" are platform-specific, and only apply on their respective platform(s), Compose HTML / JS DOM or `androidx.compose` platforms. #### Material Icons @@ -144,23 +154,24 @@ transition or animation on Compose HTML / JS DOM. These APIs are also highly exp See [CMP-4966](https://youtrack.jetbrains.com/issue/CMP-4966) for a bug to avoid. Also, ViewModel-related functions are not implemented yet on Compose HTML / JS DOM. -## Add the libraries to your dependency +## Add to your dependencies Maven coordinate: ```kotlin -"com.huanshankeji:compose-multiplatform-$module:$version" +"com.huanshankeji:compose-multiplatform-html-unified-$module:$version" ``` More specifically: + ```kotlin -"com.huanshankeji:compose-multiplatform-common:$version" -"com.huanshankeji:compose-multiplatform-material-icons-core:$version" -"com.huanshankeji:compose-multiplatform-material2:$version" -"com.huanshankeji:compose-multiplatform-material3:$version" +"com.huanshankeji:compose-multiplatform-html-unified-common:$version" +"com.huanshankeji:compose-multiplatform-html-unified-material-icons-core:$version" +"com.huanshankeji:compose-multiplatform-html-unified-material2:$version" +"com.huanshankeji:compose-multiplatform-html-unified-material3:$version" ``` -For example, depend on the Material 3 module with Gradle: +For example, to depend on the Material 3 module with Gradle: ```kotlin kotlin { diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 43563b5e..e2462300 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,7 +1,7 @@ import com.huanshankeji.CommonDependencies import org.jetbrains.compose.ComposeBuildConfig -val projectVersion = "0.4.1-SNAPSHOT" +val projectVersion = "0.5.0-SNAPSHOT" val commonDependencies = CommonDependencies() diff --git a/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts b/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts index c05e8410..0dcdddb2 100644 --- a/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts +++ b/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts @@ -16,7 +16,7 @@ kotlin { @OptIn(ExperimentalKotlinGradlePluginApi::class) applyDefaultHierarchyTemplate { common { - group("androidxCommon") { + group("composeUi") { withJvm() withAndroidTarget() group("ios") @@ -27,10 +27,10 @@ kotlin { /* sourceSets { - val androidxCommonMain by creating { dependsOn(commonMain.get()) } - jvmMain { dependsOn(androidxCommonMain) } - iosMain { dependsOn(androidxCommonMain) } - named("wasmJsMain") { dependsOn(androidxCommonMain) } + val composeUiMain by creating { dependsOn(commonMain.get()) } + jvmMain { dependsOn(composeUiMain) } + iosMain { dependsOn(composeUiMain) } + named("wasmJsMain") { dependsOn(composeUiMain) } } */ } diff --git a/compose-multiplatform-common/api/android/compose-multiplatform-common.api b/common/api/android/compose-multiplatform-html-unified-common.api similarity index 97% rename from compose-multiplatform-common/api/android/compose-multiplatform-common.api rename to common/api/android/compose-multiplatform-html-unified-common.api index f84bb479..27528923 100644 --- a/compose-multiplatform-common/api/android/compose-multiplatform-common.api +++ b/common/api/android/compose-multiplatform-html-unified-common.api @@ -1,4 +1,4 @@ -public final class com/huanshankeji/compose/Content_androidxCommonKt { +public final class com/huanshankeji/compose/Content_composeUiKt { public static final fun toContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2; public static final fun toNullableContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2; } @@ -27,7 +27,7 @@ public final class com/huanshankeji/compose/ext/LoadingState$Loading : com/huans public static final field INSTANCE Lcom/huanshankeji/compose/ext/LoadingState$Loading; } -public final class com/huanshankeji/compose/foundation/Background_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/Background_composeUiKt { public static final fun background (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -45,11 +45,11 @@ public final class com/huanshankeji/compose/foundation/BorderStroke { public fun toString ()Ljava/lang/String; } -public final class com/huanshankeji/compose/foundation/BorderStroke_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/BorderStroke_composeUiKt { public static final fun toPlatformValue (Lcom/huanshankeji/compose/foundation/BorderStroke;)Landroidx/compose/foundation/BorderStroke; } -public final class com/huanshankeji/compose/foundation/Border_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/Border_composeUiKt { public static final fun border (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun border-lG28NQ4 (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -61,11 +61,11 @@ public final class com/huanshankeji/compose/foundation/OnClick_androidKt { public static final fun onClick (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function0;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/OnClick_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/OnClick_composeUiKt { public static final fun clickable (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function0;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/Scroll_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/Scroll_composeUiKt { public static final fun HorizontalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun VerticalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun horizontalScroll (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;)Lcom/huanshankeji/compose/ui/Modifier; @@ -73,14 +73,14 @@ public final class com/huanshankeji/compose/foundation/Scroll_androidxCommonKt { public static final fun verticalScroll (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/ext/BackgroundAndBorder_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/ext/BackgroundAndBorder_composeUiKt { public static final fun roundedCornerBackgroundAndOuterBorder (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;ILcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerBackgroundAndOuterBorder-SW5qh9g (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerBackgroundAndOuterBorder-d8LSEHM (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerBackgroundAndOuterBorder-rAjV9yQ (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;ILcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/ext/Border_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/ext/Border_composeUiKt { public static final fun outerBorder (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun outerBorder-lG28NQ4 (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerOuterBorder (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;I)Lcom/huanshankeji/compose/ui/Modifier; @@ -89,7 +89,7 @@ public final class com/huanshankeji/compose/foundation/ext/Border_androidxCommon public static final fun roundedCornerOuterBorder-ziNgDLE (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;I)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly_composeUiKt { public static final fun matchPositionRelativeParentJsDom (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -164,7 +164,7 @@ public final class com/huanshankeji/compose/foundation/layout/BoxScope$Impl : co public final synthetic fun unbox-impl ()Landroidx/compose/foundation/layout/BoxScope; } -public final class com/huanshankeji/compose/foundation/layout/Box_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Box_composeUiKt { public static final fun Box (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V public static final fun Box (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } @@ -202,7 +202,7 @@ public final class com/huanshankeji/compose/foundation/layout/ColumnScope$Impl : public static fun weight-impl (Landroidx/compose/foundation/layout/ColumnScope;Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Column_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Column_composeUiKt { public static final fun Column (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/Arrangement$Vertical;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } @@ -214,7 +214,7 @@ public final class com/huanshankeji/compose/foundation/layout/IntrinsicSize : ja public static fun values ()[Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize; } -public final class com/huanshankeji/compose/foundation/layout/Intrinsic_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Intrinsic_composeUiKt { public static final fun height (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun toPlatformValue (Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize;)Landroidx/compose/foundation/layout/IntrinsicSize; public static final fun width (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize;)Lcom/huanshankeji/compose/ui/Modifier; @@ -233,7 +233,7 @@ public final class com/huanshankeji/compose/foundation/layout/PaddingValues$Abso public fun (Landroidx/compose/foundation/layout/PaddingValues$Absolute;)V } -public final class com/huanshankeji/compose/foundation/layout/Padding_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Padding_composeUiKt { public static final fun PaddingValues-0680j_4 (F)Lcom/huanshankeji/compose/foundation/layout/PaddingValues; public static final fun PaddingValues-YgX7TsA (FF)Lcom/huanshankeji/compose/foundation/layout/PaddingValues; public static synthetic fun PaddingValues-YgX7TsA$default (FFILjava/lang/Object;)Lcom/huanshankeji/compose/foundation/layout/PaddingValues; @@ -283,7 +283,7 @@ public final class com/huanshankeji/compose/foundation/layout/RowScope$Impl : co public static fun weight-impl (Landroidx/compose/foundation/layout/RowScope;Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Row_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Row_composeUiKt { public static final fun Row (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/Arrangement$Horizontal;Lcom/huanshankeji/compose/ui/Alignment$Vertical;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } @@ -291,7 +291,7 @@ public final class com/huanshankeji/compose/foundation/layout/SizeKt { public static final fun size-6HolHcs (Lcom/huanshankeji/compose/ui/Modifier;J)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Size_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Size_composeUiKt { public static final fun fillMaxHeight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; public static synthetic fun fillMaxHeight$default (Lcom/huanshankeji/compose/ui/Modifier;FILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun fillMaxSize (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; @@ -313,7 +313,7 @@ public final class com/huanshankeji/compose/foundation/layout/Size_androidxCommo public static final fun wrapContentWidth (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Spacer_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Spacer_composeUiKt { public static final fun Spacer (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V } @@ -335,11 +335,11 @@ public final class com/huanshankeji/compose/foundation/layout/ext/BoxWithConstra public fun getPlatformBoxScope ()Landroidx/compose/foundation/layout/BoxScope; } -public final class com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints_composeUiKt { public static final fun BoxWithConstraints (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/foundation/layout/ext/InnerPadding_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/InnerPadding_composeUiKt { public static final fun absoluteInnerPadding-qDBjuR0 (Lcom/huanshankeji/compose/ui/Modifier;FFFF)Lcom/huanshankeji/compose/ui/Modifier; public static synthetic fun absoluteInnerPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun innerPadding (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;)Lcom/huanshankeji/compose/ui/Modifier; @@ -350,7 +350,7 @@ public final class com/huanshankeji/compose/foundation/layout/ext/InnerPadding_a public static synthetic fun innerPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/ext/OuterPadding_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/OuterPadding_composeUiKt { public static final fun absoluteOuterPadding-qDBjuR0 (Lcom/huanshankeji/compose/ui/Modifier;FFFF)Lcom/huanshankeji/compose/ui/Modifier; public static synthetic fun absoluteOuterPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun outerPadding (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;)Lcom/huanshankeji/compose/ui/Modifier; @@ -361,7 +361,7 @@ public final class com/huanshankeji/compose/foundation/layout/ext/OuterPadding_a public static synthetic fun outerPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/ext/Size_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/Size_composeUiKt { public static final fun fillMaxHeightStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun fillMaxSizeStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun fillMaxWidthStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; @@ -378,7 +378,7 @@ public final class com/huanshankeji/compose/foundation/lazy/LazyDslKt { public static synthetic fun itemsIndexed$default (Lcom/huanshankeji/compose/foundation/lazy/LazyListScope;[Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function5;ILjava/lang/Object;)V } -public final class com/huanshankeji/compose/foundation/lazy/LazyDsl_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/lazy/LazyDsl_composeUiKt { public static final fun LazyColumn (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;ZLcom/huanshankeji/compose/foundation/layout/Arrangement$Vertical;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V public static final fun LazyRow (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;ZLcom/huanshankeji/compose/foundation/layout/Arrangement$Horizontal;Lcom/huanshankeji/compose/ui/Alignment$Vertical;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } @@ -409,7 +409,7 @@ public final class com/huanshankeji/compose/foundation/text/BasicTextKt { public static final synthetic fun BasicText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } -public final class com/huanshankeji/compose/foundation/text/BasicText_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/BasicText_composeUiKt { public static final fun BasicText (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/ColorProducer;Landroidx/compose/runtime/Composer;II)V } @@ -443,7 +443,7 @@ public final class com/huanshankeji/compose/foundation/text/KeyboardActions$Comp public final fun getDefault-eR24s0A ()Lkotlin/jvm/functions/Function1; } -public final class com/huanshankeji/compose/foundation/text/KeyboardActions_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/KeyboardActions_composeUiKt { public static final fun toCommonValue (Landroidx/compose/foundation/text/KeyboardActionScope;)Lcom/huanshankeji/compose/foundation/text/KeyboardActionScope; public static final fun toPlatformValue-XYNfWhM (Lkotlin/jvm/functions/Function1;)Landroidx/compose/foundation/text/KeyboardActions; } @@ -464,7 +464,7 @@ public final class com/huanshankeji/compose/foundation/text/KeyboardOptions$Comp public final fun getDefault ()Lcom/huanshankeji/compose/foundation/text/KeyboardOptions; } -public final class com/huanshankeji/compose/foundation/text/KeyboardOptions_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/KeyboardOptions_composeUiKt { public static final fun toPlatformValue (Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;)Landroidx/compose/foundation/text/KeyboardOptions; } @@ -474,7 +474,7 @@ public final class com/huanshankeji/compose/foundation/text/ext/TextKt { public static final fun SpanBasicText (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/ColorProducer;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/foundation/text/ext/Text_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/ext/Text_composeUiKt { public static final fun TaglessBasicText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } @@ -502,7 +502,7 @@ public final class com/huanshankeji/compose/foundation/text/input/ImeAction$Comp public final fun getSend-wMdBJBk ()I } -public final class com/huanshankeji/compose/foundation/text/input/ImeAction_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/input/ImeAction_composeUiKt { public static final fun toPlatformValue-BY5W8_o (I)I public static final fun toPlatformValue-Ya8g6bQ (Lcom/huanshankeji/compose/foundation/text/input/ImeAction;)I } @@ -527,7 +527,7 @@ public final class com/huanshankeji/compose/foundation/text/input/KeyboardCapita public final fun getWords-yuZ006c ()I } -public final class com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization_composeUiKt { public static final fun toPlatformValue-7c3A3NA (I)I public static final fun toPlatformValue-M0wbBxY (Lcom/huanshankeji/compose/foundation/text/input/KeyboardCapitalization;)I } @@ -557,7 +557,7 @@ public final class com/huanshankeji/compose/foundation/text/input/KeyboardType$C public final fun getUri-BGL2Dk4 ()I } -public final class com/huanshankeji/compose/foundation/text/input/KeyboardType_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/input/KeyboardType_composeUiKt { public static final fun toPlatformValue-6FDry6U (Lcom/huanshankeji/compose/foundation/text/input/KeyboardType;)I public static final fun toPlatformValue-awQKiIc (I)I } @@ -573,7 +573,7 @@ public final class com/huanshankeji/compose/layout/ext/HiddenKt { public static final fun reserveSpace (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/layout/ext/Hidden_androidxCommonKt { +public final class com/huanshankeji/compose/layout/ext/Hidden_composeUiKt { public static final fun hidden (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -732,11 +732,11 @@ public final class com/huanshankeji/compose/ui/Modifier$Impl : com/huanshankeji/ public final synthetic fun unbox-impl ()Landroidx/compose/ui/Modifier; } -public final class com/huanshankeji/compose/ui/draw/Alpha_androidxCommonKt { +public final class com/huanshankeji/compose/ui/draw/Alpha_composeUiKt { public static final fun alpha (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/ui/draw/Rotate_androidxCommonKt { +public final class com/huanshankeji/compose/ui/draw/Rotate_composeUiKt { public static final fun rotate (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } @@ -775,7 +775,7 @@ public abstract interface class com/huanshankeji/compose/ui/graphics/ColorProduc public abstract fun invoke ()Lcom/huanshankeji/compose/ui/graphics/Color; } -public final class com/huanshankeji/compose/ui/graphics/Color_androidxCommonKt { +public final class com/huanshankeji/compose/ui/graphics/Color_composeUiKt { public static final fun Color (FFFF)Lcom/huanshankeji/compose/ui/graphics/Color; public static final fun Color (I)Lcom/huanshankeji/compose/ui/graphics/Color; public static final fun Color (IIII)Lcom/huanshankeji/compose/ui/graphics/Color; diff --git a/compose-multiplatform-common/api/compose-multiplatform-common.klib.api b/common/api/compose-multiplatform-html-unified-common.klib.api similarity index 99% rename from compose-multiplatform-common/api/compose-multiplatform-common.klib.api rename to common/api/compose-multiplatform-html-unified-common.klib.api index 350aea3b..1cad9578 100644 --- a/compose-multiplatform-common/api/compose-multiplatform-common.klib.api +++ b/common/api/compose-multiplatform-html-unified-common.klib.api @@ -6,7 +6,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: open annotation class com.huanshankeji.compose.foundation/ExperimentalFoundationApi : kotlin/Annotation { // com.huanshankeji.compose.foundation/ExperimentalFoundationApi|null[0] constructor () // com.huanshankeji.compose.foundation/ExperimentalFoundationApi.|(){}[0] } diff --git a/compose-multiplatform-common/api/jvm/compose-multiplatform-common.api b/common/api/jvm/compose-multiplatform-html-unified-common.api similarity index 97% rename from compose-multiplatform-common/api/jvm/compose-multiplatform-common.api rename to common/api/jvm/compose-multiplatform-html-unified-common.api index bf82139b..119e3cee 100644 --- a/compose-multiplatform-common/api/jvm/compose-multiplatform-common.api +++ b/common/api/jvm/compose-multiplatform-html-unified-common.api @@ -1,4 +1,4 @@ -public final class com/huanshankeji/compose/Content_androidxCommonKt { +public final class com/huanshankeji/compose/Content_composeUiKt { public static final fun toContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2; public static final fun toNullableContentWithoutModifier (Lkotlin/jvm/functions/Function3;)Lkotlin/jvm/functions/Function2; } @@ -27,7 +27,7 @@ public final class com/huanshankeji/compose/ext/LoadingState$Loading : com/huans public static final field INSTANCE Lcom/huanshankeji/compose/ext/LoadingState$Loading; } -public final class com/huanshankeji/compose/foundation/Background_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/Background_composeUiKt { public static final fun background (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -45,11 +45,11 @@ public final class com/huanshankeji/compose/foundation/BorderStroke { public fun toString ()Ljava/lang/String; } -public final class com/huanshankeji/compose/foundation/BorderStroke_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/BorderStroke_composeUiKt { public static final fun toPlatformValue (Lcom/huanshankeji/compose/foundation/BorderStroke;)Landroidx/compose/foundation/BorderStroke; } -public final class com/huanshankeji/compose/foundation/Border_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/Border_composeUiKt { public static final fun border (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun border-lG28NQ4 (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -57,15 +57,15 @@ public final class com/huanshankeji/compose/foundation/Border_androidxCommonKt { public abstract interface annotation class com/huanshankeji/compose/foundation/ExperimentalFoundationApi : java/lang/annotation/Annotation { } -public final class com/huanshankeji/compose/foundation/OnClick_androidxCommonExceptAndroidKt { +public final class com/huanshankeji/compose/foundation/OnClick_composeUiExceptAndroidKt { public static final fun onClick (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function0;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/OnClick_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/OnClick_composeUiKt { public static final fun clickable (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function0;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/Scroll_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/Scroll_composeUiKt { public static final fun HorizontalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun VerticalScrollBox (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun horizontalScroll (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;)Lcom/huanshankeji/compose/ui/Modifier; @@ -73,14 +73,14 @@ public final class com/huanshankeji/compose/foundation/Scroll_androidxCommonKt { public static final fun verticalScroll (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/foundation/ScrollState;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/ext/BackgroundAndBorder_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/ext/BackgroundAndBorder_composeUiKt { public static final fun roundedCornerBackgroundAndOuterBorder (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;ILcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerBackgroundAndOuterBorder-SW5qh9g (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerBackgroundAndOuterBorder-d8LSEHM (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerBackgroundAndOuterBorder-rAjV9yQ (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;ILcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/ext/Border_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/ext/Border_composeUiKt { public static final fun outerBorder (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun outerBorder-lG28NQ4 (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun roundedCornerOuterBorder (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/BorderStroke;I)Lcom/huanshankeji/compose/ui/Modifier; @@ -89,7 +89,7 @@ public final class com/huanshankeji/compose/foundation/ext/Border_androidxCommon public static final fun roundedCornerOuterBorder-ziNgDLE (Lcom/huanshankeji/compose/ui/Modifier;FLcom/huanshankeji/compose/ui/graphics/Color;I)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly_composeUiKt { public static final fun matchPositionRelativeParentJsDom (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -164,7 +164,7 @@ public final class com/huanshankeji/compose/foundation/layout/BoxScope$Impl : co public final synthetic fun unbox-impl ()Landroidx/compose/foundation/layout/BoxScope; } -public final class com/huanshankeji/compose/foundation/layout/Box_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Box_composeUiKt { public static final fun Box (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V public static final fun Box (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } @@ -202,7 +202,7 @@ public final class com/huanshankeji/compose/foundation/layout/ColumnScope$Impl : public static fun weight-impl (Landroidx/compose/foundation/layout/ColumnScope;Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Column_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Column_composeUiKt { public static final fun Column (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/Arrangement$Vertical;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } @@ -214,7 +214,7 @@ public final class com/huanshankeji/compose/foundation/layout/IntrinsicSize : ja public static fun values ()[Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize; } -public final class com/huanshankeji/compose/foundation/layout/Intrinsic_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Intrinsic_composeUiKt { public static final fun height (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun toPlatformValue (Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize;)Landroidx/compose/foundation/layout/IntrinsicSize; public static final fun width (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/IntrinsicSize;)Lcom/huanshankeji/compose/ui/Modifier; @@ -233,7 +233,7 @@ public final class com/huanshankeji/compose/foundation/layout/PaddingValues$Abso public fun (Landroidx/compose/foundation/layout/PaddingValues$Absolute;)V } -public final class com/huanshankeji/compose/foundation/layout/Padding_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Padding_composeUiKt { public static final fun PaddingValues-0680j_4 (F)Lcom/huanshankeji/compose/foundation/layout/PaddingValues; public static final fun PaddingValues-YgX7TsA (FF)Lcom/huanshankeji/compose/foundation/layout/PaddingValues; public static synthetic fun PaddingValues-YgX7TsA$default (FFILjava/lang/Object;)Lcom/huanshankeji/compose/foundation/layout/PaddingValues; @@ -283,7 +283,7 @@ public final class com/huanshankeji/compose/foundation/layout/RowScope$Impl : co public static fun weight-impl (Landroidx/compose/foundation/layout/RowScope;Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Row_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Row_composeUiKt { public static final fun Row (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/Arrangement$Horizontal;Lcom/huanshankeji/compose/ui/Alignment$Vertical;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } @@ -291,7 +291,7 @@ public final class com/huanshankeji/compose/foundation/layout/SizeKt { public static final fun size-6HolHcs (Lcom/huanshankeji/compose/ui/Modifier;J)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Size_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Size_composeUiKt { public static final fun fillMaxHeight (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; public static synthetic fun fillMaxHeight$default (Lcom/huanshankeji/compose/ui/Modifier;FILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun fillMaxSize (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; @@ -313,7 +313,7 @@ public final class com/huanshankeji/compose/foundation/layout/Size_androidxCommo public static final fun wrapContentWidth (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/Spacer_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/Spacer_composeUiKt { public static final fun Spacer (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;I)V } @@ -335,11 +335,11 @@ public final class com/huanshankeji/compose/foundation/layout/ext/BoxWithConstra public fun getPlatformBoxScope ()Landroidx/compose/foundation/layout/BoxScope; } -public final class com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints_composeUiKt { public static final fun BoxWithConstraints (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/foundation/layout/ext/InnerPadding_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/InnerPadding_composeUiKt { public static final fun absoluteInnerPadding-qDBjuR0 (Lcom/huanshankeji/compose/ui/Modifier;FFFF)Lcom/huanshankeji/compose/ui/Modifier; public static synthetic fun absoluteInnerPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun innerPadding (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;)Lcom/huanshankeji/compose/ui/Modifier; @@ -350,7 +350,7 @@ public final class com/huanshankeji/compose/foundation/layout/ext/InnerPadding_a public static synthetic fun innerPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/ext/OuterPadding_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/OuterPadding_composeUiKt { public static final fun absoluteOuterPadding-qDBjuR0 (Lcom/huanshankeji/compose/ui/Modifier;FFFF)Lcom/huanshankeji/compose/ui/Modifier; public static synthetic fun absoluteOuterPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun outerPadding (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;)Lcom/huanshankeji/compose/ui/Modifier; @@ -361,7 +361,7 @@ public final class com/huanshankeji/compose/foundation/layout/ext/OuterPadding_a public static synthetic fun outerPadding-qDBjuR0$default (Lcom/huanshankeji/compose/ui/Modifier;FFFFILjava/lang/Object;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/foundation/layout/ext/Size_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/layout/ext/Size_composeUiKt { public static final fun fillMaxHeightStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun fillMaxSizeStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; public static final fun fillMaxWidthStretch (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; @@ -378,7 +378,7 @@ public final class com/huanshankeji/compose/foundation/lazy/LazyDslKt { public static synthetic fun itemsIndexed$default (Lcom/huanshankeji/compose/foundation/lazy/LazyListScope;[Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function5;ILjava/lang/Object;)V } -public final class com/huanshankeji/compose/foundation/lazy/LazyDsl_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/lazy/LazyDsl_composeUiKt { public static final fun LazyColumn (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;ZLcom/huanshankeji/compose/foundation/layout/Arrangement$Vertical;Lcom/huanshankeji/compose/ui/Alignment$Horizontal;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V public static final fun LazyRow (Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/foundation/layout/PaddingValues;ZLcom/huanshankeji/compose/foundation/layout/Arrangement$Horizontal;Lcom/huanshankeji/compose/ui/Alignment$Vertical;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } @@ -409,7 +409,7 @@ public final class com/huanshankeji/compose/foundation/text/BasicTextKt { public static final synthetic fun BasicText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } -public final class com/huanshankeji/compose/foundation/text/BasicText_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/BasicText_composeUiKt { public static final fun BasicText (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/ColorProducer;Landroidx/compose/runtime/Composer;II)V } @@ -443,7 +443,7 @@ public final class com/huanshankeji/compose/foundation/text/KeyboardActions$Comp public final fun getDefault-eR24s0A ()Lkotlin/jvm/functions/Function1; } -public final class com/huanshankeji/compose/foundation/text/KeyboardActions_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/KeyboardActions_composeUiKt { public static final fun toCommonValue (Landroidx/compose/foundation/text/KeyboardActionScope;)Lcom/huanshankeji/compose/foundation/text/KeyboardActionScope; public static final fun toPlatformValue-XYNfWhM (Lkotlin/jvm/functions/Function1;)Landroidx/compose/foundation/text/KeyboardActions; } @@ -464,7 +464,7 @@ public final class com/huanshankeji/compose/foundation/text/KeyboardOptions$Comp public final fun getDefault ()Lcom/huanshankeji/compose/foundation/text/KeyboardOptions; } -public final class com/huanshankeji/compose/foundation/text/KeyboardOptions_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/KeyboardOptions_composeUiKt { public static final fun toPlatformValue (Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;)Landroidx/compose/foundation/text/KeyboardOptions; } @@ -474,7 +474,7 @@ public final class com/huanshankeji/compose/foundation/text/ext/TextKt { public static final fun SpanBasicText (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/ColorProducer;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/foundation/text/ext/Text_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/ext/Text_composeUiKt { public static final fun TaglessBasicText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } @@ -502,7 +502,7 @@ public final class com/huanshankeji/compose/foundation/text/input/ImeAction$Comp public final fun getSend-wMdBJBk ()I } -public final class com/huanshankeji/compose/foundation/text/input/ImeAction_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/input/ImeAction_composeUiKt { public static final fun toPlatformValue-BY5W8_o (I)I public static final fun toPlatformValue-Ya8g6bQ (Lcom/huanshankeji/compose/foundation/text/input/ImeAction;)I } @@ -527,7 +527,7 @@ public final class com/huanshankeji/compose/foundation/text/input/KeyboardCapita public final fun getWords-yuZ006c ()I } -public final class com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization_composeUiKt { public static final fun toPlatformValue-7c3A3NA (I)I public static final fun toPlatformValue-M0wbBxY (Lcom/huanshankeji/compose/foundation/text/input/KeyboardCapitalization;)I } @@ -557,7 +557,7 @@ public final class com/huanshankeji/compose/foundation/text/input/KeyboardType$C public final fun getUri-BGL2Dk4 ()I } -public final class com/huanshankeji/compose/foundation/text/input/KeyboardType_androidxCommonKt { +public final class com/huanshankeji/compose/foundation/text/input/KeyboardType_composeUiKt { public static final fun toPlatformValue-6FDry6U (Lcom/huanshankeji/compose/foundation/text/input/KeyboardType;)I public static final fun toPlatformValue-awQKiIc (I)I } @@ -573,7 +573,7 @@ public final class com/huanshankeji/compose/layout/ext/HiddenKt { public static final fun reserveSpace (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/layout/ext/Hidden_androidxCommonKt { +public final class com/huanshankeji/compose/layout/ext/Hidden_composeUiKt { public static final fun hidden (Lcom/huanshankeji/compose/ui/Modifier;)Lcom/huanshankeji/compose/ui/Modifier; } @@ -732,11 +732,11 @@ public final class com/huanshankeji/compose/ui/Modifier$Impl : com/huanshankeji/ public final synthetic fun unbox-impl ()Landroidx/compose/ui/Modifier; } -public final class com/huanshankeji/compose/ui/draw/Alpha_androidxCommonKt { +public final class com/huanshankeji/compose/ui/draw/Alpha_composeUiKt { public static final fun alpha (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } -public final class com/huanshankeji/compose/ui/draw/Rotate_androidxCommonKt { +public final class com/huanshankeji/compose/ui/draw/Rotate_composeUiKt { public static final fun rotate (Lcom/huanshankeji/compose/ui/Modifier;F)Lcom/huanshankeji/compose/ui/Modifier; } @@ -775,7 +775,7 @@ public abstract interface class com/huanshankeji/compose/ui/graphics/ColorProduc public abstract fun invoke ()Lcom/huanshankeji/compose/ui/graphics/Color; } -public final class com/huanshankeji/compose/ui/graphics/Color_androidxCommonKt { +public final class com/huanshankeji/compose/ui/graphics/Color_composeUiKt { public static final fun Color (FFFF)Lcom/huanshankeji/compose/ui/graphics/Color; public static final fun Color (I)Lcom/huanshankeji/compose/ui/graphics/Color; public static final fun Color (IIII)Lcom/huanshankeji/compose/ui/graphics/Color; diff --git a/compose-multiplatform-common/build.gradle.kts b/common/build.gradle.kts similarity index 95% rename from compose-multiplatform-common/build.gradle.kts rename to common/build.gradle.kts index 91153060..1b37d89f 100644 --- a/compose-multiplatform-common/build.gradle.kts +++ b/common/build.gradle.kts @@ -10,8 +10,8 @@ kotlin { @OptIn(ExperimentalKotlinGradlePluginApi::class) applyDefaultHierarchyTemplate { common { - group("androidxCommon") { - group("androidxCommonExceptAndroid") { + group("composeUi") { + group("composeUiExceptAndroid") { withJvm() group("ios") withWasmJs() @@ -44,7 +44,7 @@ kotlin { implementation("org.jetbrains.compose.annotation-internal:annotation:${DependencyVersions.composeMultiplatform}") } } - androidxCommonMain { + composeUiMain { dependencies { api(compose.foundation) implementation(compose.ui) diff --git a/compose-multiplatform-common/legacy/api/android/compose-multiplatform-common-legacy.api b/common/legacy/api/android/compose-multiplatform-html-unified-common-legacy.api similarity index 100% rename from compose-multiplatform-common/legacy/api/android/compose-multiplatform-common-legacy.api rename to common/legacy/api/android/compose-multiplatform-html-unified-common-legacy.api diff --git a/compose-multiplatform-common/legacy/api/compose-multiplatform-common-legacy.klib.api b/common/legacy/api/compose-multiplatform-html-unified-common-legacy.klib.api similarity index 99% rename from compose-multiplatform-common/legacy/api/compose-multiplatform-common-legacy.klib.api rename to common/legacy/api/compose-multiplatform-html-unified-common-legacy.klib.api index 7e6f1d1d..12d4165f 100644 --- a/compose-multiplatform-common/legacy/api/compose-multiplatform-common-legacy.klib.api +++ b/common/legacy/api/compose-multiplatform-html-unified-common-legacy.klib.api @@ -6,7 +6,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: final class com.huanshankeji.compose.ui.color/Color { // com.huanshankeji.compose.ui.color/Color|null[0] final val platformValue // com.huanshankeji.compose.ui.color/Color.platformValue|{}platformValue[0] // Targets: [ios, wasmJs] diff --git a/compose-multiplatform-common/legacy/api/jvm/compose-multiplatform-common-legacy.api b/common/legacy/api/jvm/compose-multiplatform-html-unified-common-legacy.api similarity index 100% rename from compose-multiplatform-common/legacy/api/jvm/compose-multiplatform-common-legacy.api rename to common/legacy/api/jvm/compose-multiplatform-html-unified-common-legacy.api diff --git a/compose-multiplatform-common/legacy/build.gradle.kts b/common/legacy/build.gradle.kts similarity index 97% rename from compose-multiplatform-common/legacy/build.gradle.kts rename to common/legacy/build.gradle.kts index 88844067..c8d91add 100644 --- a/compose-multiplatform-common/legacy/build.gradle.kts +++ b/common/legacy/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { //compileOnly(compose.foundation) // for KDoc element links only } } - androidxCommonMain { + composeUiMain { dependencies { api(compose.foundation) } diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/BasicText.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/BasicText.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/BasicText.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/BasicText.kt diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/RawText.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/RawText.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/RawText.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/RawText.kt diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Box.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Box.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Box.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Box.kt diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Column.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Column.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Column.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Column.kt diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Row.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Row.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Row.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/layout/Row.kt diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt similarity index 88% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt index bfc27795..546d80ae 100644 --- a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt +++ b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt @@ -3,7 +3,7 @@ package com.huanshankeji.compose.ui.color expect object Colors { val black: Color val white: Color - val gray : Color + val gray: Color val red: Color val green: Color val blue: Color diff --git a/compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt b/common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt rename to common/legacy/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/BasicText.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/BasicText.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/BasicText.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/BasicText.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/RawText.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/RawText.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/RawText.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/RawText.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/Box.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/Box.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/Box.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/Box.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/Column.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/Column.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/Column.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/Column.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/Row.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/Row.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/Row.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/Row.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScopeJvm.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScopeJvm.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScopeJvm.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScopeJvm.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/color/ColorJvm.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/color/ColorJvm.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/color/ColorJvm.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/color/ColorJvm.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt diff --git a/compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt b/common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt rename to common/legacy/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/BasicText.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/BasicText.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/BasicText.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/BasicText.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/RawText.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/RawText.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/RawText.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/RawText.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Box.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Box.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Box.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Box.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Column.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Column.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Column.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Column.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Row.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Row.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Row.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/layout/Row.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Color.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/color/Colors.kt diff --git a/compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt b/common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt similarity index 100% rename from compose-multiplatform-common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt rename to common/legacy/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Sizes.kt diff --git a/compose-multiplatform-common/src/androidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.android.kt b/common/src/androidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.android.kt similarity index 100% rename from compose-multiplatform-common/src/androidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.android.kt rename to common/src/androidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.android.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/Content.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/Content.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/Content.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/Content.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ExtRecommendedApi.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ExtRecommendedApi.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ExtRecommendedApi.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ExtRecommendedApi.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ext/LoadingState.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ext/LoadingState.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ext/LoadingState.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ext/LoadingState.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Background.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Background.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Background.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Background.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Border.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Border.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Border.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Border.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ExperimentalFoundationApi.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ExperimentalFoundationApi.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ExperimentalFoundationApi.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ExperimentalFoundationApi.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.kt similarity index 87% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.kt index 68f88dce..1dc27287 100644 --- a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.kt +++ b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.kt @@ -10,7 +10,7 @@ import com.huanshankeji.compose.ui.Modifier expect fun Modifier.onClick(onClick: () -> Unit): Modifier /** - * Has the interactive effect when clicked on the `androidxCommon` targets. + * Has the interactive effect when clicked on the `composeUi` targets. */ @ExperimentalFoundationApi expect fun Modifier.clickable(onClick: () -> Unit): Modifier diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Scroll.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Scroll.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Scroll.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/Scroll.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.kt similarity index 96% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.kt index e6d640ec..e5eae230 100644 --- a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.kt +++ b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.kt @@ -6,7 +6,6 @@ import androidx.compose.ui.unit.dp import com.huanshankeji.compose.foundation.background import com.huanshankeji.compose.foundation.clickable import com.huanshankeji.compose.foundation.layout.PaddingValues -import com.huanshankeji.compose.foundation.layout.padding import com.huanshankeji.compose.ui.Modifier /** diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.kt similarity index 96% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.kt index ffcb90f5..196d1b0b 100644 --- a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.kt +++ b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.kt @@ -6,7 +6,6 @@ import androidx.compose.ui.unit.dp import com.huanshankeji.compose.foundation.background import com.huanshankeji.compose.foundation.clickable import com.huanshankeji.compose.foundation.layout.PaddingValues -import com.huanshankeji.compose.foundation.layout.padding import com.huanshankeji.compose.ui.Modifier /** diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/runtime/DeferredComposableRunner.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/runtime/DeferredComposableRunner.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/runtime/DeferredComposableRunner.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/runtime/DeferredComposableRunner.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Alignment.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Alignment.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Alignment.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Alignment.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Modifier.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Modifier.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Modifier.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ui/Modifier.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.kt diff --git a/compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/ext/DpOrPercentage.kt b/common/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/ext/DpOrPercentage.kt similarity index 100% rename from compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/ext/DpOrPercentage.kt rename to common/src/commonMain/kotlin/com/huanshankeji/compose/ui/unit/ext/DpOrPercentage.kt diff --git a/compose-multiplatform-common/src/androidxCommonExceptAndroidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.androidxCommonExceptAndroid.kt b/common/src/composeUiExceptAndroidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.composeUiExceptAndroid.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonExceptAndroidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.androidxCommonExceptAndroid.kt rename to common/src/composeUiExceptAndroidMain/kotlin/com/huanshankeji/compose/foundation/OnClick.composeUiExceptAndroid.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/Content.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/Content.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/Content.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/Content.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/Background.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/Background.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/Background.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/Background.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/Border.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/Border.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/Border.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/Border.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/BorderStroke.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/OnClick.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/OnClick.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/OnClick.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/Scroll.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/Scroll.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/Scroll.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/Scroll.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardActions.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.composeUi.kt similarity index 95% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.composeUi.kt index 0685efbd..31d14365 100644 --- a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.androidxCommon.kt +++ b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.composeUi.kt @@ -4,6 +4,7 @@ import com.huanshankeji.compose.foundation.text.input.toPlatformValue import androidx.compose.foundation.text.KeyboardOptions as PlatformKeyboardOptions fun KeyboardOptions.toPlatformValue(): PlatformKeyboardOptions = + // TODO deprecated PlatformKeyboardOptions( capitalization.toPlatformValue(), autoCorrect ?: true, diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/ImeAction.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/Alignment.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/Alignment.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/Alignment.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/Alignment.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/Modifier.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/Modifier.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/Modifier.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/Modifier.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.composeUi.kt diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.composeUi.kt similarity index 75% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.composeUi.kt index be43029e..182b1fe7 100644 --- a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.androidxCommon.kt +++ b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.composeUi.kt @@ -4,4 +4,4 @@ import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Brush as PlatformBrush @Immutable -actual class Brush(val platformValue : PlatformBrush) \ No newline at end of file +actual class Brush(val platformValue: PlatformBrush) \ No newline at end of file diff --git a/compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.androidxCommon.kt b/common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.composeUi.kt similarity index 100% rename from compose-multiplatform-common/src/androidxCommonMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.androidxCommon.kt rename to common/src/composeUiMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.composeUi.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/browser/Browser.kt b/common/src/jsMain/kotlin/com/huanshankeji/browser/Browser.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/browser/Browser.kt rename to common/src/jsMain/kotlin/com/huanshankeji/browser/Browser.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ContentDescription.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ContentDescription.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ContentDescription.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ContentDescription.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Background.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Background.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Background.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Background.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Border.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Border.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Border.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Border.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/OnClick.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/OnClick.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/OnClick.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/OnClick.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Scroll.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Scroll.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Scroll.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Scroll.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/BackgroundAndBorder.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/Border.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsDom.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsDom.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsDom.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsDom.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/css/Scroll.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/css/Scroll.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/css/Scroll.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/ext/css/Scroll.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Arrangement.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/FlexBasis.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/FlexBasis.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/FlexBasis.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/FlexBasis.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Intrinsic.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/KobwebCompose.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/KobwebCompose.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/KobwebCompose.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/KobwebCompose.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Padding.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Size.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Spacer.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Box.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Box.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Box.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Box.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/BoxWithConstraints.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/InnerPadding.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/OuterPadding.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Size.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/BasicText.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptions.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptionsAndKeyboardActions.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptionsAndKeyboardActions.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptionsAndKeyboardActions.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/KeyboardOptionsAndKeyboardActions.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/ext/Text.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardCapitalization.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/KeyboardType.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/text/input/PlatformImeOptions.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/layout/ext/Hidden.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Alignment.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Alignment.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Alignment.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Alignment.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Modifier.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Modifier.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Modifier.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/Modifier.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Alpha.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/draw/Rotate.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Brush.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.js.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.js.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.js.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/graphics/Color.js.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Dp.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Dp.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Dp.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Dp.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Percent.kt b/common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Percent.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Percent.kt rename to common/src/jsMain/kotlin/com/huanshankeji/compose/ui/unit/Percent.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Layout.kt b/common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Layout.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Layout.kt rename to common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Layout.kt diff --git a/compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Size.kt b/common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Size.kt similarity index 100% rename from compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Size.kt rename to common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Size.kt diff --git a/demo/api/android/demo.api b/demo/api/android/compose-multiplatform-html-unified-demo.api similarity index 58% rename from demo/api/android/demo.api rename to demo/api/android/compose-multiplatform-html-unified-demo.api index 5de6e434..72f361c5 100644 --- a/demo/api/android/demo.api +++ b/demo/api/android/compose-multiplatform-html-unified-demo.api @@ -20,12 +20,12 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$A public static field lambda-5 Lkotlin/jvm/functions/Function3; public static field lambda-6 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-3$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-4$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-5$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-6$demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-3$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-4$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-5$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-6$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$CommonKt { @@ -33,17 +33,21 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$C public static field lambda-1 Lkotlin/jvm/functions/Function3; public static field lambda-2 Lkotlin/jvm/functions/Function4; public static field lambda-3 Lkotlin/jvm/functions/Function3; + public static field lambda-4 Lkotlin/jvm/functions/Function3; + public static field lambda-5 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$demo_release ()Lkotlin/jvm/functions/Function4; - public final fun getLambda-3$demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-3$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-4$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-5$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$MainActivityKt { public static final field INSTANCE Lcom/huanshankeji/compose/material/demo/ComposableSingletons$MainActivityKt; public static field lambda-1 Lkotlin/jvm/functions/Function2; public fun ()V - public final fun getLambda-1$demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-1$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$Material2Kt { @@ -59,16 +63,16 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$M public static field lambda-8 Lkotlin/jvm/functions/Function3; public static field lambda-9 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-10$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-3$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-4$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-5$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-6$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-7$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-8$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-9$demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-10$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-3$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-4$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-5$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-6$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-7$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-8$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-9$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$Material3Kt { @@ -81,13 +85,13 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$M public static field lambda-6 Lkotlin/jvm/functions/Function2; public static field lambda-7 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-2$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-3$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-4$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-5$demo_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-6$demo_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-7$demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-2$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-3$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-4$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-5$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-6$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-7$compose_multiplatform_html_unified_demo_release ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/MainActivity : androidx/activity/ComponentActivity { diff --git a/demo/api/demo.klib.api b/demo/api/compose-multiplatform-html-unified-demo.klib.api similarity index 98% rename from demo/api/demo.klib.api rename to demo/api/compose-multiplatform-html-unified-demo.klib.api index 37996c40..a1da6f9e 100644 --- a/demo/api/demo.klib.api +++ b/demo/api/compose-multiplatform-html-unified-demo.klib.api @@ -6,7 +6,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: final enum class com.huanshankeji.compose.material.demo/Screen : kotlin/Enum { // com.huanshankeji.compose.material.demo/Screen|null[0] enum entry Common // com.huanshankeji.compose.material.demo/Screen.Common|null[0] enum entry Home // com.huanshankeji.compose.material.demo/Screen.Home|null[0] diff --git a/demo/api/jvm/demo.api b/demo/api/jvm/compose-multiplatform-html-unified-demo.api similarity index 59% rename from demo/api/jvm/demo.api rename to demo/api/jvm/compose-multiplatform-html-unified-demo.api index 8c0c23f8..7b55b6f4 100644 --- a/demo/api/jvm/demo.api +++ b/demo/api/jvm/compose-multiplatform-html-unified-demo.api @@ -20,12 +20,12 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$A public static field lambda-5 Lkotlin/jvm/functions/Function3; public static field lambda-6 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-3$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-4$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-5$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-6$demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-3$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-4$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-5$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-6$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$CommonKt { @@ -33,10 +33,14 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$C public static field lambda-1 Lkotlin/jvm/functions/Function3; public static field lambda-2 Lkotlin/jvm/functions/Function4; public static field lambda-3 Lkotlin/jvm/functions/Function3; + public static field lambda-4 Lkotlin/jvm/functions/Function3; + public static field lambda-5 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$demo ()Lkotlin/jvm/functions/Function4; - public final fun getLambda-3$demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-3$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-4$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-5$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$MainKt { @@ -44,8 +48,8 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$M public static field lambda-1 Lkotlin/jvm/functions/Function3; public static field lambda-2 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$Material2Kt { @@ -61,16 +65,16 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$M public static field lambda-8 Lkotlin/jvm/functions/Function3; public static field lambda-9 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-10$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-3$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-4$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-5$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-6$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-7$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-8$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-9$demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-10$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-3$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-4$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-5$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-6$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-7$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-8$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-9$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/ComposableSingletons$Material3Kt { @@ -83,13 +87,13 @@ public final class com/huanshankeji/compose/material/demo/ComposableSingletons$M public static field lambda-6 Lkotlin/jvm/functions/Function2; public static field lambda-7 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda-1$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-2$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-3$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-4$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-5$demo ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-6$demo ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-7$demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-2$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-3$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-4$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-5$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-6$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-7$compose_multiplatform_html_unified_demo ()Lkotlin/jvm/functions/Function3; } public final class com/huanshankeji/compose/material/demo/MainKt { diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts index df384517..f487ac56 100644 --- a/demo/build.gradle.kts +++ b/demo/build.gradle.kts @@ -1,3 +1,4 @@ +import com.huanshankeji.cpnProject import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { @@ -46,9 +47,9 @@ kotlin { commonMain { dependencies { implementation(compose.runtime) - implementation(project(":compose-multiplatform-material2")) - implementation(project(":compose-multiplatform-material3")) - implementation(project(":compose-multiplatform-navigation")) + implementation(cpnProject(project, ":material2")) + implementation(cpnProject(project, ":material3")) + implementation(cpnProject(project, ":navigation")) /* see https://github.com/JetBrains/compose-multiplatform-core/blob/476d43b99a27696d12ef087e8028d90789645ba7/compose/ui/ui/build.gradle#L54 and https://github.com/JetBrains/compose-multiplatform-core/blob/381796b5e682653aa1fa53e6bcf0441d06b873f8/compose/runtime/runtime/build.gradle#L124 @@ -63,7 +64,7 @@ kotlin { } androidMain { dependencies { - // TODO consider putting this in `androidxCommonMain` + // TODO consider putting this in `composeUiMain` implementation(compose.ui) implementation(commonDependencies.androidx.activity.compose()) diff --git a/demo/side-by-side-site/index.html b/demo/side-by-side-site/index.html index 65fa310a..d7426997 100644 --- a/demo/side-by-side-site/index.html +++ b/demo/side-by-side-site/index.html @@ -36,7 +36,7 @@

JS DOM / Compose HTML

-

Wasm JS canvas / androidx.compose

+

Wasm JS canvas / Compose UI

diff --git a/gradle.properties b/gradle.properties index 39977236..6f0060c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # For Wasm # More memory is needed now to compile the Wasm target in Gradle org.gradle.jvmargs=-Xmx2G -# For the `androidxCommon` custom source sets +# For the `composeUi` custom source sets #kotlin.mpp.applyDefaultHierarchyTemplate=false # For Android android.useAndroidX=true diff --git a/compose-multiplatform-lifecycle-viewmodel/api/android/compose-multiplatform-lifecycle-viewmodel.api b/lifecycle-viewmodel/api/android/compose-multiplatform-html-unified-lifecycle-viewmodel.api similarity index 100% rename from compose-multiplatform-lifecycle-viewmodel/api/android/compose-multiplatform-lifecycle-viewmodel.api rename to lifecycle-viewmodel/api/android/compose-multiplatform-html-unified-lifecycle-viewmodel.api diff --git a/compose-multiplatform-lifecycle-viewmodel/api/compose-multiplatform-lifecycle-viewmodel.klib.api b/lifecycle-viewmodel/api/compose-multiplatform-html-unified-lifecycle-viewmodel.klib.api similarity index 95% rename from compose-multiplatform-lifecycle-viewmodel/api/compose-multiplatform-lifecycle-viewmodel.klib.api rename to lifecycle-viewmodel/api/compose-multiplatform-html-unified-lifecycle-viewmodel.klib.api index 395f26b8..8678f89a 100644 --- a/compose-multiplatform-lifecycle-viewmodel/api/compose-multiplatform-lifecycle-viewmodel.klib.api +++ b/lifecycle-viewmodel/api/compose-multiplatform-html-unified-lifecycle-viewmodel.klib.api @@ -5,5 +5,5 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: final inline fun <#A: reified androidx.lifecycle/ViewModel> com.huanshankeji.androidx.lifecycle.viewmodel.compose/viewModel(kotlin/String?, noinline kotlin/Function1, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int): #A // com.huanshankeji.androidx.lifecycle.viewmodel.compose/viewModel|viewModel(kotlin.String?;kotlin.Function1;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){0§}[0] diff --git a/compose-multiplatform-lifecycle-viewmodel/api/jvm/compose-multiplatform-lifecycle-viewmodel.api b/lifecycle-viewmodel/api/jvm/compose-multiplatform-html-unified-lifecycle-viewmodel.api similarity index 100% rename from compose-multiplatform-lifecycle-viewmodel/api/jvm/compose-multiplatform-lifecycle-viewmodel.api rename to lifecycle-viewmodel/api/jvm/compose-multiplatform-html-unified-lifecycle-viewmodel.api diff --git a/compose-multiplatform-lifecycle-viewmodel/build.gradle.kts b/lifecycle-viewmodel/build.gradle.kts similarity index 97% rename from compose-multiplatform-lifecycle-viewmodel/build.gradle.kts rename to lifecycle-viewmodel/build.gradle.kts index 84648b77..38114e06 100644 --- a/compose-multiplatform-lifecycle-viewmodel/build.gradle.kts +++ b/lifecycle-viewmodel/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { api(commonDependencies.jetbrainsAndroidx.lifecycle.viewmodel()) } } - androidxCommonMain { + composeUiMain { dependencies { api(commonDependencies.jetbrainsAndroidx.lifecycle.viewmodelCompose()) } diff --git a/compose-multiplatform-lifecycle-viewmodel/src/commonMain/kotlin/ViewModel.kt b/lifecycle-viewmodel/src/commonMain/kotlin/ViewModel.kt similarity index 100% rename from compose-multiplatform-lifecycle-viewmodel/src/commonMain/kotlin/ViewModel.kt rename to lifecycle-viewmodel/src/commonMain/kotlin/ViewModel.kt diff --git a/compose-multiplatform-lifecycle-viewmodel/src/androidxCommonMain/kotlin/ViewModel.androidxCommon.kt b/lifecycle-viewmodel/src/composeUiMain/kotlin/ViewModel.composeUi.kt similarity index 100% rename from compose-multiplatform-lifecycle-viewmodel/src/androidxCommonMain/kotlin/ViewModel.androidxCommon.kt rename to lifecycle-viewmodel/src/composeUiMain/kotlin/ViewModel.composeUi.kt diff --git a/compose-multiplatform-lifecycle-viewmodel/src/jsMain/kotlin/ViewModel.js.kt b/lifecycle-viewmodel/src/jsMain/kotlin/ViewModel.js.kt similarity index 100% rename from compose-multiplatform-lifecycle-viewmodel/src/jsMain/kotlin/ViewModel.js.kt rename to lifecycle-viewmodel/src/jsMain/kotlin/ViewModel.js.kt diff --git a/compose-multiplatform-material-icons-core/api/android/compose-multiplatform-material-icons-core.api b/material-icons-core/api/android/compose-multiplatform-html-unified-material-icons-core.api similarity index 98% rename from compose-multiplatform-material-icons-core/api/android/compose-multiplatform-material-icons-core.api rename to material-icons-core/api/android/compose-multiplatform-html-unified-material-icons-core.api index 376e4897..7880565c 100644 --- a/compose-multiplatform-material-icons-core/api/android/compose-multiplatform-material-icons-core.api +++ b/material-icons-core/api/android/compose-multiplatform-html-unified-material-icons-core.api @@ -60,13 +60,13 @@ public final class com/huanshankeji/compose/material/icons/Icons$TwoTone { public static final field INSTANCE Lcom/huanshankeji/compose/material/icons/Icons$TwoTone; } -public final class com/huanshankeji/compose/material/icons/automirrored/filled/Icons_androidxCommonKt { +public final class com/huanshankeji/compose/material/icons/automirrored/filled/Icons_composeUiKt { public static final fun getArrowBack (Lcom/huanshankeji/compose/material/icons/Icons$AutoMirrored$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getArrowForward (Lcom/huanshankeji/compose/material/icons/Icons$AutoMirrored$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getLogout (Lcom/huanshankeji/compose/material/icons/Icons$AutoMirrored$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; } -public final class com/huanshankeji/compose/material/icons/filled/Icons_androidxCommonKt { +public final class com/huanshankeji/compose/material/icons/filled/Icons_composeUiKt { public static final fun getAdd (Lcom/huanshankeji/compose/material/icons/Icons$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getArrowDropDown (Lcom/huanshankeji/compose/material/icons/Icons$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getDone (Lcom/huanshankeji/compose/material/icons/Icons$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; diff --git a/compose-multiplatform-material-icons-core/api/compose-multiplatform-material-icons-core.klib.api b/material-icons-core/api/compose-multiplatform-html-unified-material-icons-core.klib.api similarity index 99% rename from compose-multiplatform-material-icons-core/api/compose-multiplatform-material-icons-core.klib.api rename to material-icons-core/api/compose-multiplatform-html-unified-material-icons-core.klib.api index 3b658883..aae53086 100644 --- a/compose-multiplatform-material-icons-core/api/compose-multiplatform-material-icons-core.klib.api +++ b/material-icons-core/api/compose-multiplatform-html-unified-material-icons-core.klib.api @@ -6,7 +6,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: final object com.huanshankeji.compose.material.icons/Icons { // com.huanshankeji.compose.material.icons/Icons|null[0] final val Default // com.huanshankeji.compose.material.icons/Icons.Default|{}Default[0] final fun (): com.huanshankeji.compose.material.icons/Icons.Filled // com.huanshankeji.compose.material.icons/Icons.Default.|(){}[0] diff --git a/compose-multiplatform-material-icons-core/api/jvm/compose-multiplatform-material-icons-core.api b/material-icons-core/api/jvm/compose-multiplatform-html-unified-material-icons-core.api similarity index 98% rename from compose-multiplatform-material-icons-core/api/jvm/compose-multiplatform-material-icons-core.api rename to material-icons-core/api/jvm/compose-multiplatform-html-unified-material-icons-core.api index 376e4897..7880565c 100644 --- a/compose-multiplatform-material-icons-core/api/jvm/compose-multiplatform-material-icons-core.api +++ b/material-icons-core/api/jvm/compose-multiplatform-html-unified-material-icons-core.api @@ -60,13 +60,13 @@ public final class com/huanshankeji/compose/material/icons/Icons$TwoTone { public static final field INSTANCE Lcom/huanshankeji/compose/material/icons/Icons$TwoTone; } -public final class com/huanshankeji/compose/material/icons/automirrored/filled/Icons_androidxCommonKt { +public final class com/huanshankeji/compose/material/icons/automirrored/filled/Icons_composeUiKt { public static final fun getArrowBack (Lcom/huanshankeji/compose/material/icons/Icons$AutoMirrored$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getArrowForward (Lcom/huanshankeji/compose/material/icons/Icons$AutoMirrored$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getLogout (Lcom/huanshankeji/compose/material/icons/Icons$AutoMirrored$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; } -public final class com/huanshankeji/compose/material/icons/filled/Icons_androidxCommonKt { +public final class com/huanshankeji/compose/material/icons/filled/Icons_composeUiKt { public static final fun getAdd (Lcom/huanshankeji/compose/material/icons/Icons$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getArrowDropDown (Lcom/huanshankeji/compose/material/icons/Icons$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; public static final fun getDone (Lcom/huanshankeji/compose/material/icons/Icons$Filled;)Landroidx/compose/ui/graphics/vector/ImageVector; diff --git a/compose-multiplatform-material-icons-core/build.gradle.kts b/material-icons-core/build.gradle.kts similarity index 97% rename from compose-multiplatform-material-icons-core/build.gradle.kts rename to material-icons-core/build.gradle.kts index 4d75f71c..9508ed13 100644 --- a/compose-multiplatform-material-icons-core/build.gradle.kts +++ b/material-icons-core/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { implementation(compose.runtime) } } - androidxCommonMain { + composeUiMain { dependencies { api("org.jetbrains.compose.material:material-icons-extended:${DependencyVersions.composeMultiplatform}") } diff --git a/compose-multiplatform-material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/Icons.kt b/material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/Icons.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/Icons.kt rename to material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/Icons.kt diff --git a/compose-multiplatform-material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.kt b/material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.kt rename to material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.kt diff --git a/compose-multiplatform-material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.kt b/material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.kt rename to material-icons-core/src/commonMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.kt diff --git a/compose-multiplatform-material-icons-core/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/icons/Icons.androidxCommon.kt b/material-icons-core/src/composeUiMain/kotlin/com/huanshankeji/compose/material/icons/Icons.composeUi.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/icons/Icons.androidxCommon.kt rename to material-icons-core/src/composeUiMain/kotlin/com/huanshankeji/compose/material/icons/Icons.composeUi.kt diff --git a/compose-multiplatform-material-icons-core/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.androidxCommon.kt b/material-icons-core/src/composeUiMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.composeUi.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.androidxCommon.kt rename to material-icons-core/src/composeUiMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.composeUi.kt diff --git a/compose-multiplatform-material-icons-core/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.androidxCommon.kt b/material-icons-core/src/composeUiMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.composeUi.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.androidxCommon.kt rename to material-icons-core/src/composeUiMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.composeUi.kt diff --git a/compose-multiplatform-material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/Icons.js.kt b/material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/Icons.js.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/Icons.js.kt rename to material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/Icons.js.kt diff --git a/compose-multiplatform-material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.js.kt b/material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.js.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.js.kt rename to material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/automirrored/filled/Icons.js.kt diff --git a/compose-multiplatform-material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.js.kt b/material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.js.kt similarity index 100% rename from compose-multiplatform-material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.js.kt rename to material-icons-core/src/jsMain/kotlin/com/huanshankeji/compose/material/icons/filled/Icons.js.kt diff --git a/compose-multiplatform-material2/api/android/compose-multiplatform-material2.api b/material2/api/android/compose-multiplatform-html-unified-material2.api similarity index 92% rename from compose-multiplatform-material2/api/android/compose-multiplatform-material2.api rename to material2/api/android/compose-multiplatform-html-unified-material2.api index 88a5df8d..6f564127 100644 --- a/compose-multiplatform-material2/api/android/compose-multiplatform-material2.api +++ b/material2/api/android/compose-multiplatform-html-unified-material2.api @@ -1,26 +1,26 @@ -public final class com/huanshankeji/compose/material2/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun OutlinedButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun TextButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Card_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Card_composeUiKt { public static final fun Card (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Checkbox_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Checkbox_composeUiKt { public static final fun Checkbox (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Divider_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Divider_composeUiKt { public static final fun Divider (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material2/IconButton_composeUiKt { public static final fun IconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Icon_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Icon_composeUiKt { public static final fun Icon (Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } @@ -72,7 +72,7 @@ public abstract class com/huanshankeji/compose/material2/SnackbarHostStateCommon public static synthetic fun showSnackbar$default (Lcom/huanshankeji/compose/material2/SnackbarHostStateCommonImpl;Ljava/lang/String;Ljava/lang/String;Lcom/huanshankeji/compose/material2/SnackbarDuration;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; } -public final class com/huanshankeji/compose/material2/SnackbarHost_androidxCommonKt { +public final class com/huanshankeji/compose/material2/SnackbarHost_composeUiKt { public static final fun SnackbarHost (Lcom/huanshankeji/compose/material2/SnackbarHostState;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V public static final fun toCommonValue (Landroidx/compose/material/SnackbarData;)Lcom/huanshankeji/compose/material2/SnackbarData; public static final fun toCommonValue (Landroidx/compose/material/SnackbarDuration;)Lcom/huanshankeji/compose/material2/SnackbarDuration; @@ -89,16 +89,16 @@ public final class com/huanshankeji/compose/material2/SnackbarResult : java/lang public static fun values ()[Lcom/huanshankeji/compose/material2/SnackbarResult; } -public final class com/huanshankeji/compose/material2/Snackbar_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Snackbar_composeUiKt { public static final fun Snackbar (Lcom/huanshankeji/compose/material2/SnackbarData;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V public static final fun Snackbar (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Switch_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Switch_composeUiKt { public static final fun Switch (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Text_composeUiKt { public static final fun Text (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;Landroidx/compose/runtime/Composer;II)V } @@ -118,23 +118,23 @@ public final class com/huanshankeji/compose/material2/ext/ButtonType : java/lang public static fun values ()[Lcom/huanshankeji/compose/material2/ext/ButtonType; } -public final class com/huanshankeji/compose/material2/ext/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/material2/ext/ButtonType;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_androidxCommonKt { - public static final field INSTANCE Lcom/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_androidxCommonKt; +public final class com/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_composeUiKt { + public static final field INSTANCE Lcom/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_composeUiKt; public static field lambda-1 Lkotlin/jvm/functions/Function3; public static field lambda-2 Lkotlin/jvm/functions/Function3; public static field lambda-3 Lkotlin/jvm/functions/Function2; public static field lambda-4 Lkotlin/jvm/functions/Function3; public static field lambda-5 Lkotlin/jvm/functions/Function2; public fun ()V - public final fun getLambda-1$compose_multiplatform_material2_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$compose_multiplatform_material2_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-3$compose_multiplatform_material2_release ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-4$compose_multiplatform_material2_release ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-5$compose_multiplatform_material2_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-1$compose_multiplatform_html_unified_material2_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_material2_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-3$compose_multiplatform_html_unified_material2_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-4$compose_multiplatform_html_unified_material2_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-5$compose_multiplatform_html_unified_material2_release ()Lkotlin/jvm/functions/Function2; } public final class com/huanshankeji/compose/material2/ext/FabPosition : java/lang/Enum { @@ -146,7 +146,7 @@ public final class com/huanshankeji/compose/material2/ext/FabPosition : java/lan public static fun values ()[Lcom/huanshankeji/compose/material2/ext/FabPosition; } -public final class com/huanshankeji/compose/material2/ext/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/IconButton_composeUiKt { public static final fun IconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Landroidx/compose/runtime/Composer;II)V } @@ -161,17 +161,17 @@ public final class com/huanshankeji/compose/material2/ext/NavigationIconScope$Co public final fun getInstance ()Lcom/huanshankeji/compose/material2/ext/NavigationIconScope; } -public final class com/huanshankeji/compose/material2/ext/Radio_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Radio_composeUiKt { public static final fun RadioGroupColumn (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun RadioGroupRow (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun RadioRow (ZLjava/lang/String;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/Switch_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Switch_composeUiKt { public static final fun SwitchWithLabel (ZLkotlin/jvm/functions/Function1;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/TextField_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/TextField_composeUiKt { public static final fun OutlinedTextField-hXYnEmQ (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZLandroidx/compose/runtime/Composer;II)V public static final fun OutlinedTextFieldWithMaterialIcons-hXYnEmQ (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZLandroidx/compose/runtime/Composer;II)V public static final fun TextArea-4h3C4Pw (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ILandroidx/compose/runtime/Composer;II)V @@ -185,7 +185,7 @@ public final class com/huanshankeji/compose/material2/ext/TextKt { public static final fun SpanText (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Text_composeUiKt { public static final fun TaglessText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } @@ -197,7 +197,7 @@ public final class com/huanshankeji/compose/material2/ext/TopAppBarActionsScope public final fun getRowScope ()Landroidx/compose/foundation/layout/RowScope; } -public final class com/huanshankeji/compose/material2/ext/TopAppBarScaffold_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/TopAppBarScaffold_composeUiKt { public static final fun PrimitiveTopAppBarScaffold (Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun TopAppBarScaffold (Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/material2/ext/FabPosition;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun toPlatformValue (Lcom/huanshankeji/compose/material2/ext/FabPosition;)I @@ -217,7 +217,7 @@ public final class com/huanshankeji/compose/material2/lazy/ext/LazyDslKt { public static synthetic fun conventionalItems$default (Lcom/huanshankeji/compose/material2/lazy/ext/ListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V } -public final class com/huanshankeji/compose/material2/lazy/ext/LazyDsl_androidxCommonKt { +public final class com/huanshankeji/compose/material2/lazy/ext/LazyDsl_composeUiKt { public static final fun List (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } diff --git a/compose-multiplatform-material2/api/compose-multiplatform-material2.klib.api b/material2/api/compose-multiplatform-html-unified-material2.klib.api similarity index 99% rename from compose-multiplatform-material2/api/compose-multiplatform-material2.klib.api rename to material2/api/compose-multiplatform-html-unified-material2.klib.api index 6a3775e4..4e5e6ca3 100644 --- a/compose-multiplatform-material2/api/compose-multiplatform-material2.klib.api +++ b/material2/api/compose-multiplatform-html-unified-material2.klib.api @@ -6,7 +6,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: final enum class com.huanshankeji.compose.material2.ext/ButtonType : kotlin/Enum { // com.huanshankeji.compose.material2.ext/ButtonType|null[0] enum entry Contained // com.huanshankeji.compose.material2.ext/ButtonType.Contained|null[0] enum entry Outlined // com.huanshankeji.compose.material2.ext/ButtonType.Outlined|null[0] diff --git a/compose-multiplatform-material2/api/jvm/compose-multiplatform-material2.api b/material2/api/jvm/compose-multiplatform-html-unified-material2.api similarity index 92% rename from compose-multiplatform-material2/api/jvm/compose-multiplatform-material2.api rename to material2/api/jvm/compose-multiplatform-html-unified-material2.api index b3454cbf..f1ba452a 100644 --- a/compose-multiplatform-material2/api/jvm/compose-multiplatform-material2.api +++ b/material2/api/jvm/compose-multiplatform-html-unified-material2.api @@ -1,26 +1,26 @@ -public final class com/huanshankeji/compose/material2/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun OutlinedButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun TextButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Card_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Card_composeUiKt { public static final fun Card (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Checkbox_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Checkbox_composeUiKt { public static final fun Checkbox (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Divider_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Divider_composeUiKt { public static final fun Divider (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material2/IconButton_composeUiKt { public static final fun IconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Icon_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Icon_composeUiKt { public static final fun Icon (Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } @@ -72,7 +72,7 @@ public abstract class com/huanshankeji/compose/material2/SnackbarHostStateCommon public static synthetic fun showSnackbar$default (Lcom/huanshankeji/compose/material2/SnackbarHostStateCommonImpl;Ljava/lang/String;Ljava/lang/String;Lcom/huanshankeji/compose/material2/SnackbarDuration;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; } -public final class com/huanshankeji/compose/material2/SnackbarHost_androidxCommonKt { +public final class com/huanshankeji/compose/material2/SnackbarHost_composeUiKt { public static final fun SnackbarHost (Lcom/huanshankeji/compose/material2/SnackbarHostState;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V public static final fun toCommonValue (Landroidx/compose/material/SnackbarData;)Lcom/huanshankeji/compose/material2/SnackbarData; public static final fun toCommonValue (Landroidx/compose/material/SnackbarDuration;)Lcom/huanshankeji/compose/material2/SnackbarDuration; @@ -89,16 +89,16 @@ public final class com/huanshankeji/compose/material2/SnackbarResult : java/lang public static fun values ()[Lcom/huanshankeji/compose/material2/SnackbarResult; } -public final class com/huanshankeji/compose/material2/Snackbar_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Snackbar_composeUiKt { public static final fun Snackbar (Lcom/huanshankeji/compose/material2/SnackbarData;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V public static final fun Snackbar (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Switch_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Switch_composeUiKt { public static final fun Switch (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material2/Text_composeUiKt { public static final fun Text (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;Landroidx/compose/runtime/Composer;II)V } @@ -118,23 +118,23 @@ public final class com/huanshankeji/compose/material2/ext/ButtonType : java/lang public static fun values ()[Lcom/huanshankeji/compose/material2/ext/ButtonType; } -public final class com/huanshankeji/compose/material2/ext/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/material2/ext/ButtonType;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_androidxCommonKt { - public static final field INSTANCE Lcom/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_androidxCommonKt; +public final class com/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_composeUiKt { + public static final field INSTANCE Lcom/huanshankeji/compose/material2/ext/ComposableSingletons$TopAppBarScaffold_composeUiKt; public static field lambda-1 Lkotlin/jvm/functions/Function3; public static field lambda-2 Lkotlin/jvm/functions/Function3; public static field lambda-3 Lkotlin/jvm/functions/Function2; public static field lambda-4 Lkotlin/jvm/functions/Function3; public static field lambda-5 Lkotlin/jvm/functions/Function2; public fun ()V - public final fun getLambda-1$compose_multiplatform_material2 ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-2$compose_multiplatform_material2 ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-3$compose_multiplatform_material2 ()Lkotlin/jvm/functions/Function2; - public final fun getLambda-4$compose_multiplatform_material2 ()Lkotlin/jvm/functions/Function3; - public final fun getLambda-5$compose_multiplatform_material2 ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-1$compose_multiplatform_html_unified_material2 ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$compose_multiplatform_html_unified_material2 ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-3$compose_multiplatform_html_unified_material2 ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-4$compose_multiplatform_html_unified_material2 ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-5$compose_multiplatform_html_unified_material2 ()Lkotlin/jvm/functions/Function2; } public final class com/huanshankeji/compose/material2/ext/FabPosition : java/lang/Enum { @@ -146,7 +146,7 @@ public final class com/huanshankeji/compose/material2/ext/FabPosition : java/lan public static fun values ()[Lcom/huanshankeji/compose/material2/ext/FabPosition; } -public final class com/huanshankeji/compose/material2/ext/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/IconButton_composeUiKt { public static final fun IconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Landroidx/compose/runtime/Composer;II)V } @@ -161,17 +161,17 @@ public final class com/huanshankeji/compose/material2/ext/NavigationIconScope$Co public final fun getInstance ()Lcom/huanshankeji/compose/material2/ext/NavigationIconScope; } -public final class com/huanshankeji/compose/material2/ext/Radio_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Radio_composeUiKt { public static final fun RadioGroupColumn (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun RadioGroupRow (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun RadioRow (ZLjava/lang/String;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/Switch_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Switch_composeUiKt { public static final fun SwitchWithLabel (ZLkotlin/jvm/functions/Function1;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/TextField_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/TextField_composeUiKt { public static final fun OutlinedTextField-hXYnEmQ (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZLandroidx/compose/runtime/Composer;II)V public static final fun OutlinedTextFieldWithMaterialIcons-hXYnEmQ (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZLandroidx/compose/runtime/Composer;II)V public static final fun TextArea-4h3C4Pw (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;Lcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ILandroidx/compose/runtime/Composer;II)V @@ -185,7 +185,7 @@ public final class com/huanshankeji/compose/material2/ext/TextKt { public static final fun SpanText (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material2/ext/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/Text_composeUiKt { public static final fun TaglessText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } @@ -197,7 +197,7 @@ public final class com/huanshankeji/compose/material2/ext/TopAppBarActionsScope public final fun getRowScope ()Landroidx/compose/foundation/layout/RowScope; } -public final class com/huanshankeji/compose/material2/ext/TopAppBarScaffold_androidxCommonKt { +public final class com/huanshankeji/compose/material2/ext/TopAppBarScaffold_composeUiKt { public static final fun PrimitiveTopAppBarScaffold (Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun TopAppBarScaffold (Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lcom/huanshankeji/compose/material2/ext/FabPosition;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun toPlatformValue (Lcom/huanshankeji/compose/material2/ext/FabPosition;)I @@ -217,7 +217,7 @@ public final class com/huanshankeji/compose/material2/lazy/ext/LazyDslKt { public static synthetic fun conventionalItems$default (Lcom/huanshankeji/compose/material2/lazy/ext/ListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V } -public final class com/huanshankeji/compose/material2/lazy/ext/LazyDsl_androidxCommonKt { +public final class com/huanshankeji/compose/material2/lazy/ext/LazyDsl_composeUiKt { public static final fun List (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } diff --git a/compose-multiplatform-material2/build.gradle.kts b/material2/build.gradle.kts similarity index 90% rename from compose-multiplatform-material2/build.gradle.kts rename to material2/build.gradle.kts index 38bc12eb..ab83b01d 100644 --- a/compose-multiplatform-material2/build.gradle.kts +++ b/material2/build.gradle.kts @@ -1,3 +1,4 @@ +import com.huanshankeji.cpnProject import com.huanshankeji.team.`Shreck Ye` import com.huanshankeji.team.pomForTeamDefaultOpenSource @@ -16,13 +17,13 @@ kotlin { dependencies { api(compose.runtime) implementation("org.jetbrains.compose.annotation-internal:annotation:${DependencyVersions.composeMultiplatform}") - api(project(":compose-multiplatform-common")) - api(project(":compose-multiplatform-material-icons-core")) + api(cpnProject(project, ":common")) + api(cpnProject(project, ":material-icons-core")) //compileOnly(compose.material) // for KDoc element links only implementation(commonDependencies.kotlinx.coroutines.core()) } } - androidxCommonMain { + composeUiMain { dependencies { //implementation(compose.foundation) // not needed implementation(compose.material) diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Button.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Button.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Button.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Button.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Card.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Card.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Card.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Card.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Divider.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Divider.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Divider.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Divider.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Icon.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Icon.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Icon.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Icon.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/IconButton.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/IconButton.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/IconButton.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/IconButton.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Snackbar.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Snackbar.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Snackbar.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Snackbar.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHostStateCommonImpl.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHostStateCommonImpl.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHostStateCommonImpl.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHostStateCommonImpl.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Switch.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Switch.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Switch.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Switch.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Text.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Text.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Text.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/Text.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.kt diff --git a/compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.kt b/material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.kt similarity index 100% rename from compose-multiplatform-material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.kt rename to material2/src/commonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Button.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Button.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Button.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Button.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Card.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Card.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Card.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Card.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Checkbox.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Checkbox.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Checkbox.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Divider.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Divider.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Divider.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Divider.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Icon.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Icon.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Icon.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Icon.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/IconButton.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/IconButton.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/IconButton.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/IconButton.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Snackbar.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Snackbar.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Snackbar.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Snackbar.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Switch.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Switch.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Switch.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Switch.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Text.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Text.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/Text.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/Text.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Button.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Button.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Button.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Text.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/Text.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/Text.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.composeUi.kt diff --git a/compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.androidxCommon.kt b/material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.composeUi.kt similarity index 100% rename from compose-multiplatform-material2/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.androidxCommon.kt rename to material2/src/composeUiMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.composeUi.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Button.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Button.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Button.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Button.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Card.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Card.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Card.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Card.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Checkbox.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Checkbox.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Checkbox.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Checkbox.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Divider.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Divider.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Divider.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Divider.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Icon.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Icon.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Icon.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Icon.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/IconButton.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/IconButton.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/IconButton.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/IconButton.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Snackbar.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Snackbar.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Snackbar.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Snackbar.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/SnackbarHost.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Switch.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Switch.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Switch.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Switch.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Text.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Text.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Text.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Text.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Button.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Button.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Button.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Button.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/IconButton.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Radio.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Switch.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Text.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Text.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Text.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/Text.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TextField.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/ext/TopAppBarScaffold.js.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/icons/IconsMdc.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/icons/IconsMdc.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/icons/IconsMdc.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/icons/IconsMdc.kt diff --git a/compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.js.kt b/material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.js.kt similarity index 100% rename from compose-multiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.js.kt rename to material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/lazy/ext/LazyDsl.js.kt diff --git a/compose-multiplatform-material3/api/jvm/compose-multiplatform-material3.api b/material3/api/android/compose-multiplatform-html-unified-material3.api similarity index 96% rename from compose-multiplatform-material3/api/jvm/compose-multiplatform-material3.api rename to material3/api/android/compose-multiplatform-html-unified-material3.api index 84e1127b..77a2a2f4 100644 --- a/compose-multiplatform-material3/api/jvm/compose-multiplatform-material3.api +++ b/material3/api/android/compose-multiplatform-html-unified-material3.api @@ -2,7 +2,7 @@ public final class com/huanshankeji/compose/material3/ButtonKt { public static final fun FilledButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V @@ -14,24 +14,24 @@ public final class com/huanshankeji/compose/material3/CardKt { public static final fun FilledCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Card_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Card_composeUiKt { public static final fun Card (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun OutlinedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Checkbox_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Checkbox_composeUiKt { public static final fun Checkbox (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/FloatingActionButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/FloatingActionButton_composeUiKt { public static final fun ExtendedFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun LargeFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun SmallFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/IconButton_composeUiKt { public static final fun FilledIconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun FilledIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalIconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V @@ -42,22 +42,22 @@ public final class com/huanshankeji/compose/material3/IconButton_androidxCommonK public static final fun OutlinedIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Icon_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Icon_composeUiKt { public static final fun Icon (Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ProgressIndicator_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ProgressIndicator_composeUiKt { public static final fun CircularProgressIndicator (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun CircularProgressIndicator (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun LinearProgressIndicator (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun LinearProgressIndicator (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Switch_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Switch_composeUiKt { public static final fun Switch (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Text_composeUiKt { public static final fun Text (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;Landroidx/compose/runtime/Composer;II)V } @@ -70,7 +70,7 @@ public final class com/huanshankeji/compose/material3/ext/ButtonKt { public static final fun TextButtonWithMaterialIcon (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/ui/graphics/vector/ImageVector;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V @@ -82,7 +82,7 @@ public final class com/huanshankeji/compose/material3/ext/CardKt { public static final fun FilledCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/Card_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Card_composeUiKt { public static final fun Card (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun OutlinedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V @@ -129,7 +129,7 @@ public final class com/huanshankeji/compose/material3/ext/ExposedDropdownMenuKt public static final fun ExposedDropdownMenuBoxWithTextField (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuBoxTextFieldArgs;Lcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuArgs;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/ExposedDropdownMenu_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/ExposedDropdownMenu_composeUiKt { public static final fun ExposedDropdownMenuBox (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun ExposedDropdownMenuBoxTextField (Lcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuBoxScope;ZLcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuBoxTextFieldArgs;Landroidx/compose/runtime/Composer;I)V } @@ -141,7 +141,7 @@ public final class com/huanshankeji/compose/material3/ext/FloatingActionButtonKt public static final fun SmallFloatingActionButtonWithMaterialIcon (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/FloatingActionButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/FloatingActionButton_composeUiKt { public static final fun ExtendedFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Ljava/lang/String;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun LargeFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V @@ -155,7 +155,7 @@ public final class com/huanshankeji/compose/material3/ext/IconButtonKt { public static final fun OutlinedIconToggleButtonWithMaterialIcons (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/IconButton_composeUiKt { public static final fun FilledIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun IconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V @@ -171,7 +171,7 @@ public final class com/huanshankeji/compose/material3/ext/MenuKt { public static final fun DropdownMenuItemWithMaterialIcons (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/Menu_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Menu_composeUiKt { public static final fun DropdownMenu--jUOA0U (ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;JLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun DropdownMenuBox (Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V public static final fun DropdownMenuItem (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;ZZLandroidx/compose/runtime/Composer;II)V @@ -187,7 +187,7 @@ public final class com/huanshankeji/compose/material3/ext/NavigationBarScope { public final fun getRowScope ()Landroidx/compose/foundation/layout/RowScope; } -public final class com/huanshankeji/compose/material3/ext/NavigationBar_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/NavigationBar_composeUiKt { public static final fun NavigationBar (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun NavigationBarItem (Lcom/huanshankeji/compose/material3/ext/NavigationBarScope;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;ZLandroidx/compose/runtime/Composer;II)V } @@ -197,7 +197,7 @@ public final class com/huanshankeji/compose/material3/ext/TextFieldKt { public static final fun TextFieldWithMaterialIcons-pFt4Jx4 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZZLjava/lang/String;Ljava/lang/String;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZILandroidx/compose/runtime/Composer;III)V } -public final class com/huanshankeji/compose/material3/ext/TextField_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/TextField_composeUiKt { public static final fun OutlinedTextField-pFt4Jx4 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZZLjava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZILandroidx/compose/runtime/Composer;III)V public static final fun TextField-pFt4Jx4 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZZLjava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZILandroidx/compose/runtime/Composer;III)V public static final fun ToNullableTextComposable (Ljava/lang/String;)Lkotlin/jvm/functions/Function2; @@ -213,7 +213,7 @@ public final class com/huanshankeji/compose/material3/ext/TextKt { public static final fun toTextWithModifier (Ljava/lang/String;)Lkotlin/jvm/functions/Function3; } -public final class com/huanshankeji/compose/material3/ext/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Text_composeUiKt { public static final fun TaglessText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } @@ -257,7 +257,7 @@ public final class com/huanshankeji/compose/material3/lazy/ext/ListScope { public static synthetic fun items$default (Lcom/huanshankeji/compose/material3/lazy/ext/ListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)V } -public final class com/huanshankeji/compose/material3/lazy/ext/List_androidxCommonKt { +public final class com/huanshankeji/compose/material3/lazy/ext/List_composeUiKt { public static final fun List (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } diff --git a/compose-multiplatform-material3/api/compose-multiplatform-material3.klib.api b/material3/api/compose-multiplatform-html-unified-material3.klib.api similarity index 99% rename from compose-multiplatform-material3/api/compose-multiplatform-material3.klib.api rename to material3/api/compose-multiplatform-html-unified-material3.klib.api index 358f1ad3..4c2a4a9e 100644 --- a/compose-multiplatform-material3/api/compose-multiplatform-material3.klib.api +++ b/material3/api/compose-multiplatform-html-unified-material3.klib.api @@ -6,7 +6,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: final class com.huanshankeji.compose.material3.ext/DropdownMenuBoxScope { // com.huanshankeji.compose.material3.ext/DropdownMenuBoxScope|null[0] final fun (com.huanshankeji.compose.ui/Modifier).menuAnchorJsDom(): com.huanshankeji.compose.ui/Modifier // com.huanshankeji.compose.material3.ext/DropdownMenuBoxScope.menuAnchorJsDom|menuAnchorJsDom@com.huanshankeji.compose.ui.Modifier(){}[0] final fun DropdownMenu(kotlin/Boolean, kotlin/Function0, kotlin/Function0, com.huanshankeji.compose.ui/Modifier?, androidx.compose.ui.unit/DpOffset, kotlin/Function2, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int) // com.huanshankeji.compose.material3.ext/DropdownMenuBoxScope.DropdownMenu|DropdownMenu(kotlin.Boolean;kotlin.Function0;kotlin.Function0;com.huanshankeji.compose.ui.Modifier?;androidx.compose.ui.unit.DpOffset;kotlin.Function2;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0] diff --git a/compose-multiplatform-material3/api/android/compose-multiplatform-material3.api b/material3/api/jvm/compose-multiplatform-html-unified-material3.api similarity index 96% rename from compose-multiplatform-material3/api/android/compose-multiplatform-material3.api rename to material3/api/jvm/compose-multiplatform-html-unified-material3.api index 84e1127b..77a2a2f4 100644 --- a/compose-multiplatform-material3/api/android/compose-multiplatform-material3.api +++ b/material3/api/jvm/compose-multiplatform-html-unified-material3.api @@ -2,7 +2,7 @@ public final class com/huanshankeji/compose/material3/ButtonKt { public static final fun FilledButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V @@ -14,24 +14,24 @@ public final class com/huanshankeji/compose/material3/CardKt { public static final fun FilledCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Card_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Card_composeUiKt { public static final fun Card (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun OutlinedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Checkbox_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Checkbox_composeUiKt { public static final fun Checkbox (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/FloatingActionButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/FloatingActionButton_composeUiKt { public static final fun ExtendedFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun LargeFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun SmallFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/IconButton_composeUiKt { public static final fun FilledIconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun FilledIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalIconButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V @@ -42,22 +42,22 @@ public final class com/huanshankeji/compose/material3/IconButton_androidxCommonK public static final fun OutlinedIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Icon_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Icon_composeUiKt { public static final fun Icon (Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ProgressIndicator_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ProgressIndicator_composeUiKt { public static final fun CircularProgressIndicator (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun CircularProgressIndicator (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun LinearProgressIndicator (Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun LinearProgressIndicator (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Switch_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Switch_composeUiKt { public static final fun Switch (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material3/Text_composeUiKt { public static final fun Text (Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/graphics/Color;Landroidx/compose/runtime/Composer;II)V } @@ -70,7 +70,7 @@ public final class com/huanshankeji/compose/material3/ext/ButtonKt { public static final fun TextButtonWithMaterialIcon (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/ui/graphics/vector/ImageVector;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/Button_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Button_composeUiKt { public static final fun Button (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function3;ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V @@ -82,7 +82,7 @@ public final class com/huanshankeji/compose/material3/ext/CardKt { public static final fun FilledCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/Card_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Card_composeUiKt { public static final fun Card (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun ElevatedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun OutlinedCard (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V @@ -129,7 +129,7 @@ public final class com/huanshankeji/compose/material3/ext/ExposedDropdownMenuKt public static final fun ExposedDropdownMenuBoxWithTextField (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuBoxTextFieldArgs;Lcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuArgs;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/ExposedDropdownMenu_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/ExposedDropdownMenu_composeUiKt { public static final fun ExposedDropdownMenuBox (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun ExposedDropdownMenuBoxTextField (Lcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuBoxScope;ZLcom/huanshankeji/compose/material3/ext/ExposedDropdownMenuBoxTextFieldArgs;Landroidx/compose/runtime/Composer;I)V } @@ -141,7 +141,7 @@ public final class com/huanshankeji/compose/material3/ext/FloatingActionButtonKt public static final fun SmallFloatingActionButtonWithMaterialIcon (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/FloatingActionButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/FloatingActionButton_composeUiKt { public static final fun ExtendedFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Ljava/lang/String;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun LargeFloatingActionButton (Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V @@ -155,7 +155,7 @@ public final class com/huanshankeji/compose/material3/ext/IconButtonKt { public static final fun OutlinedIconToggleButtonWithMaterialIcons (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLandroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/IconButton_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/IconButton_composeUiKt { public static final fun FilledIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun FilledTonalIconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun IconToggleButton (ZLkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V @@ -171,7 +171,7 @@ public final class com/huanshankeji/compose/material3/ext/MenuKt { public static final fun DropdownMenuItemWithMaterialIcons (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;ZLandroidx/compose/runtime/Composer;II)V } -public final class com/huanshankeji/compose/material3/ext/Menu_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Menu_composeUiKt { public static final fun DropdownMenu--jUOA0U (ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;JLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun DropdownMenuBox (Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V public static final fun DropdownMenuItem (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;ZZLandroidx/compose/runtime/Composer;II)V @@ -187,7 +187,7 @@ public final class com/huanshankeji/compose/material3/ext/NavigationBarScope { public final fun getRowScope ()Landroidx/compose/foundation/layout/RowScope; } -public final class com/huanshankeji/compose/material3/ext/NavigationBar_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/NavigationBar_composeUiKt { public static final fun NavigationBar (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun NavigationBarItem (Lcom/huanshankeji/compose/material3/ext/NavigationBarScope;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lcom/huanshankeji/compose/ui/Modifier;ZLjava/lang/String;ZLandroidx/compose/runtime/Composer;II)V } @@ -197,7 +197,7 @@ public final class com/huanshankeji/compose/material3/ext/TextFieldKt { public static final fun TextFieldWithMaterialIcons-pFt4Jx4 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZZLjava/lang/String;Ljava/lang/String;Landroidx/compose/ui/graphics/vector/ImageVector;Landroidx/compose/ui/graphics/vector/ImageVector;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZILandroidx/compose/runtime/Composer;III)V } -public final class com/huanshankeji/compose/material3/ext/TextField_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/TextField_composeUiKt { public static final fun OutlinedTextField-pFt4Jx4 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZZLjava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZILandroidx/compose/runtime/Composer;III)V public static final fun TextField-pFt4Jx4 (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lcom/huanshankeji/compose/ui/Modifier;ZZLjava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/huanshankeji/compose/foundation/text/KeyboardOptions;Lcom/huanshankeji/compose/foundation/text/KeyboardActions;ZILandroidx/compose/runtime/Composer;III)V public static final fun ToNullableTextComposable (Ljava/lang/String;)Lkotlin/jvm/functions/Function2; @@ -213,7 +213,7 @@ public final class com/huanshankeji/compose/material3/ext/TextKt { public static final fun toTextWithModifier (Ljava/lang/String;)Lkotlin/jvm/functions/Function3; } -public final class com/huanshankeji/compose/material3/ext/Text_androidxCommonKt { +public final class com/huanshankeji/compose/material3/ext/Text_composeUiKt { public static final fun TaglessText (Ljava/lang/String;Landroidx/compose/runtime/Composer;I)V } @@ -257,7 +257,7 @@ public final class com/huanshankeji/compose/material3/lazy/ext/ListScope { public static synthetic fun items$default (Lcom/huanshankeji/compose/material3/lazy/ext/ListScope;ILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;ILjava/lang/Object;)V } -public final class com/huanshankeji/compose/material3/lazy/ext/List_androidxCommonKt { +public final class com/huanshankeji/compose/material3/lazy/ext/List_composeUiKt { public static final fun List (Lcom/huanshankeji/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } diff --git a/compose-multiplatform-material3/build.gradle.kts b/material3/build.gradle.kts similarity index 89% rename from compose-multiplatform-material3/build.gradle.kts rename to material3/build.gradle.kts index 344bbd20..1e94d775 100644 --- a/compose-multiplatform-material3/build.gradle.kts +++ b/material3/build.gradle.kts @@ -1,4 +1,4 @@ - +import com.huanshankeji.cpnProject import com.huanshankeji.team.`Shreck Ye` import com.huanshankeji.team.pomForTeamDefaultOpenSource @@ -23,12 +23,12 @@ kotlin { commonMain { dependencies { api(compose.runtime) - api(project(":compose-multiplatform-common")) - api(project(":compose-multiplatform-material-icons-core")) + api(cpnProject(project, ":common")) + api(cpnProject(project, ":material-icons-core")) //compileOnly(compose.material) // for KDoc element links only } } - androidxCommonMain { + composeUiMain { dependencies { api(compose.material3) } diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Button.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Button.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Button.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Button.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Card.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Card.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Card.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Card.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Checkbox.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Checkbox.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Checkbox.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Checkbox.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Icon.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Icon.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Icon.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Icon.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/IconButton.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/IconButton.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/IconButton.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/IconButton.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/SnackbarHost.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/SnackbarHost.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/SnackbarHost.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/SnackbarHost.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Switch.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Switch.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Switch.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Switch.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Text.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Text.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Text.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/Text.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Button.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Button.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Button.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Button.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Card.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Card.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Card.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Card.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Icon.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Icon.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Icon.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Icon.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Switch.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Switch.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Switch.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Switch.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Text.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Text.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Text.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/Text.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.kt diff --git a/compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.kt b/material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.kt similarity index 100% rename from compose-multiplatform-material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.kt rename to material3/src/commonMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Button.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Button.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Button.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Button.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Card.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Card.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Card.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Card.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Checkbox.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Checkbox.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Checkbox.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Checkbox.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.composeUi.kt similarity index 87% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.composeUi.kt index 90e68ca2..e9b079e8 100644 --- a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.androidxCommon.kt +++ b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.composeUi.kt @@ -18,7 +18,7 @@ actual fun SmallFloatingActionButton( onClick: () -> Unit, modifier: Modifier, content: @Composable () -> Unit -) = +) = androidx.compose.material3.SmallFloatingActionButton(onClick, modifier.platformModifier, content = content) @Composable @@ -26,7 +26,7 @@ actual fun LargeFloatingActionButton( onClick: () -> Unit, modifier: Modifier, content: @Composable () -> Unit -) = +) = androidx.compose.material3.LargeFloatingActionButton(onClick, modifier.platformModifier, content = content) @Composable @@ -34,5 +34,7 @@ actual fun ExtendedFloatingActionButton( onClick: () -> Unit, modifier: Modifier, content: @Composable RowScope.() -> Unit -) = - androidx.compose.material3.ExtendedFloatingActionButton(onClick, modifier.platformModifier, content = content.toPlatformRowScopeContent()) +) = + androidx.compose.material3.ExtendedFloatingActionButton( + onClick, modifier.platformModifier, content = content.toPlatformRowScopeContent() + ) diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Icon.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Icon.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Icon.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Icon.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/IconButton.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/IconButton.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/IconButton.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/IconButton.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Switch.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Switch.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Switch.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Switch.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Text.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Text.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/Text.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/Text.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Button.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Button.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Button.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Button.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Card.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Card.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Card.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Card.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.composeUi.kt similarity index 95% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.composeUi.kt index 017e9434..b3763365 100644 --- a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.androidxCommon.kt +++ b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.composeUi.kt @@ -23,7 +23,7 @@ actual fun ExposedDropdownMenuBox( @OptIn(ExperimentalMaterial3Api::class) actual class ExposedDropdownMenuBoxScope(val platformValue: androidx.compose.material3.ExposedDropdownMenuBoxScope) { actual fun Modifier.menuAnchor(): Modifier = - platformModify { with(platformValue) { menuAnchor() } } + platformModify { with(platformValue) { menuAnchor() } } // TODO add `type` @Composable actual fun ExposedDropdownMenu( @@ -48,6 +48,7 @@ actual fun ExposedDropdownMenuBoxScope.ExposedDropdownMenuBoxTextField( with(args) { @OptIn(ExperimentalMaterial3Api::class) TextField( + // TODO add `type` modifier = with(platformValue) { PlatformModifier.menuAnchor(/*MenuAnchorType.PrimaryNotEditable*/) }, // `MenuAnchorType` seems to be not supported in the latest version of Compose Multiplatform yet value = value, onValueChange = onValueChange, diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Text.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Text.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/Text.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/Text.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.composeUi.kt diff --git a/compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.androidxCommon.kt b/material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.composeUi.kt similarity index 100% rename from compose-multiplatform-material3/src/androidxCommonMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.androidxCommon.kt rename to material3/src/composeUiMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.composeUi.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Button.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Button.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Button.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Button.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Card.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Card.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Card.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Card.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Checkbox.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Checkbox.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Checkbox.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Checkbox.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/CommonButton.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/CommonButton.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/CommonButton.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/CommonButton.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/FloatingActionButton.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Icon.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Icon.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Icon.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Icon.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/IconButton.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/IconButton.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/IconButton.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/IconButton.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ProgressIndicator.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Switch.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Switch.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Switch.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Switch.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Text.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Text.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Text.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/Text.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Button.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Button.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Button.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Button.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Card.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Card.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Card.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Card.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.js.kt similarity index 98% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.js.kt index a4442414..cbb57ff0 100644 --- a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.js.kt +++ b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/ExposedDropdownMenu.js.kt @@ -87,7 +87,7 @@ actual fun ExposedDropdownMenuBoxScope.ExposedDropdownMenuBoxTextField( expanded: Boolean, args: ExposedDropdownMenuBoxTextFieldArgs ) = with(args) { - // adapted from the `androidxCommon` one + // adapted from the `composeUi` one TextField( modifier = Modifier.menuAnchor(/*MenuAnchorType.PrimaryNotEditable*/), value = value, diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/FloatingActionButton.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/IconButton.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Menu.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/NavigationBar.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Text.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Text.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Text.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/Text.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/ext/TextField.js.kt diff --git a/compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.js.kt b/material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.js.kt similarity index 100% rename from compose-multiplatform-material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.js.kt rename to material3/src/jsMain/kotlin/com/huanshankeji/compose/material3/lazy/ext/List.js.kt diff --git a/compose-multiplatform-navigation/api/jvm/compose-multiplatform-navigation.api b/navigation/api/android/compose-multiplatform-html-unified-navigation.api similarity index 93% rename from compose-multiplatform-navigation/api/jvm/compose-multiplatform-navigation.api rename to navigation/api/android/compose-multiplatform-html-unified-navigation.api index 9b637a9b..d697ede7 100644 --- a/compose-multiplatform-navigation/api/jvm/compose-multiplatform-navigation.api +++ b/navigation/api/android/compose-multiplatform-html-unified-navigation.api @@ -1,14 +1,14 @@ -public final class com/huanshankeji/androidx/navigation/compose/NavGraphBuilder_androidxCommonKt { +public final class com/huanshankeji/androidx/navigation/compose/NavGraphBuilder_composeUiKt { public static final fun composable (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;)V public static synthetic fun composable$default (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)V } -public final class com/huanshankeji/androidx/navigation/compose/NavHostController_androidxCommonKt { +public final class com/huanshankeji/androidx/navigation/compose/NavHostController_composeUiKt { public static final fun currentBackStackEntryAsState (Landroidx/navigation/NavController;Landroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public static final fun rememberNavController ([Landroidx/navigation/Navigator;Landroidx/compose/runtime/Composer;I)Landroidx/navigation/NavHostController; } -public final class com/huanshankeji/androidx/navigation/compose/NavHost_androidxCommonKt { +public final class com/huanshankeji/androidx/navigation/compose/NavHost_composeUiKt { public static final fun NavHost (Landroidx/navigation/NavHostController;Landroidx/navigation/NavGraph;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Landroidx/compose/runtime/Composer;II)V public static final fun NavHost (Landroidx/navigation/NavHostController;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } diff --git a/compose-multiplatform-navigation/api/compose-multiplatform-navigation.klib.api b/navigation/api/compose-multiplatform-html-unified-navigation.klib.api similarity index 99% rename from compose-multiplatform-navigation/api/compose-multiplatform-navigation.klib.api rename to navigation/api/compose-multiplatform-html-unified-navigation.klib.api index 1752fe19..cf211cec 100644 --- a/compose-multiplatform-navigation/api/compose-multiplatform-navigation.klib.api +++ b/navigation/api/compose-multiplatform-html-unified-navigation.klib.api @@ -5,7 +5,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: final fun (androidx.navigation/NavController).com.huanshankeji.androidx.navigation.compose/currentBackStackEntryAsState(androidx.compose.runtime/Composer?, kotlin/Int): androidx.compose.runtime/State // com.huanshankeji.androidx.navigation.compose/currentBackStackEntryAsState|currentBackStackEntryAsState@androidx.navigation.NavController(androidx.compose.runtime.Composer?;kotlin.Int){}[0] final fun (androidx.navigation/NavGraphBuilder).com.huanshankeji.androidx.navigation.compose/composable(kotlin/String, kotlin.collections/List = ..., kotlin.collections/List = ..., kotlin/Function3) // com.huanshankeji.androidx.navigation.compose/composable|composable@androidx.navigation.NavGraphBuilder(kotlin.String;kotlin.collections.List;kotlin.collections.List;kotlin.Function3){}[0] final fun com.huanshankeji.androidx.navigation.compose/NavHost(androidx.navigation/NavHostController, androidx.navigation/NavGraph, com.huanshankeji.compose.ui/Modifier?, com.huanshankeji.compose.ui/Alignment?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int) // com.huanshankeji.androidx.navigation.compose/NavHost|NavHost(androidx.navigation.NavHostController;androidx.navigation.NavGraph;com.huanshankeji.compose.ui.Modifier?;com.huanshankeji.compose.ui.Alignment?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0] diff --git a/compose-multiplatform-navigation/api/android/compose-multiplatform-navigation.api b/navigation/api/jvm/compose-multiplatform-html-unified-navigation.api similarity index 93% rename from compose-multiplatform-navigation/api/android/compose-multiplatform-navigation.api rename to navigation/api/jvm/compose-multiplatform-html-unified-navigation.api index 9b637a9b..d697ede7 100644 --- a/compose-multiplatform-navigation/api/android/compose-multiplatform-navigation.api +++ b/navigation/api/jvm/compose-multiplatform-html-unified-navigation.api @@ -1,14 +1,14 @@ -public final class com/huanshankeji/androidx/navigation/compose/NavGraphBuilder_androidxCommonKt { +public final class com/huanshankeji/androidx/navigation/compose/NavGraphBuilder_composeUiKt { public static final fun composable (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;)V public static synthetic fun composable$default (Landroidx/navigation/NavGraphBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)V } -public final class com/huanshankeji/androidx/navigation/compose/NavHostController_androidxCommonKt { +public final class com/huanshankeji/androidx/navigation/compose/NavHostController_composeUiKt { public static final fun currentBackStackEntryAsState (Landroidx/navigation/NavController;Landroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/State; public static final fun rememberNavController ([Landroidx/navigation/Navigator;Landroidx/compose/runtime/Composer;I)Landroidx/navigation/NavHostController; } -public final class com/huanshankeji/androidx/navigation/compose/NavHost_androidxCommonKt { +public final class com/huanshankeji/androidx/navigation/compose/NavHost_composeUiKt { public static final fun NavHost (Landroidx/navigation/NavHostController;Landroidx/navigation/NavGraph;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Landroidx/compose/runtime/Composer;II)V public static final fun NavHost (Landroidx/navigation/NavHostController;Ljava/lang/String;Lcom/huanshankeji/compose/ui/Modifier;Lcom/huanshankeji/compose/ui/Alignment;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V } diff --git a/compose-multiplatform-navigation/build.gradle.kts b/navigation/build.gradle.kts similarity index 90% rename from compose-multiplatform-navigation/build.gradle.kts rename to navigation/build.gradle.kts index 4623c38d..0ad712fe 100644 --- a/compose-multiplatform-navigation/build.gradle.kts +++ b/navigation/build.gradle.kts @@ -1,3 +1,4 @@ +import com.huanshankeji.cpnProject import com.huanshankeji.team.`Shreck Ye` import com.huanshankeji.team.pomForTeamDefaultOpenSource @@ -17,11 +18,11 @@ kotlin { api(compose.runtime) api(commonDependencies.jetbrainsAndroidx.navigation.runtime()) //implementation("org.jetbrains.compose.annotation-internal:annotation:${DependencyVersions.composeMultiplatform}") - api(project(":compose-multiplatform-common")) // for `Modifier` and `Alignment` + api(cpnProject(project, ":common")) // for `Modifier` and `Alignment` //implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0") // This depends on Compose target '[jscanvas]'. } } - androidxCommonMain { + composeUiMain { dependencies { api(commonDependencies.jetbrainsAndroidx.navigation.compose()) } diff --git a/compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/NavController.kt b/navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/NavController.kt similarity index 100% rename from compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/NavController.kt rename to navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/NavController.kt diff --git a/compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.kt b/navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.kt similarity index 100% rename from compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.kt rename to navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.kt diff --git a/compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.kt b/navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.kt similarity index 100% rename from compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.kt rename to navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.kt diff --git a/compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.kt b/navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.kt similarity index 100% rename from compose-multiplatform-navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.kt rename to navigation/src/commonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.kt diff --git a/compose-multiplatform-navigation/src/androidxCommonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.androidxCommon.kt b/navigation/src/composeUiMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.composeUi.kt similarity index 100% rename from compose-multiplatform-navigation/src/androidxCommonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.androidxCommon.kt rename to navigation/src/composeUiMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.composeUi.kt diff --git a/compose-multiplatform-navigation/src/androidxCommonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.androidxCommon.kt b/navigation/src/composeUiMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.composeUi.kt similarity index 100% rename from compose-multiplatform-navigation/src/androidxCommonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.androidxCommon.kt rename to navigation/src/composeUiMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.composeUi.kt diff --git a/compose-multiplatform-navigation/src/androidxCommonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.androidxCommon.kt b/navigation/src/composeUiMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.composeUi.kt similarity index 100% rename from compose-multiplatform-navigation/src/androidxCommonMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.androidxCommon.kt rename to navigation/src/composeUiMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.composeUi.kt diff --git a/compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/ComposeNavigator.kt b/navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/ComposeNavigator.kt similarity index 100% rename from compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/ComposeNavigator.kt rename to navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/ComposeNavigator.kt diff --git a/compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.js.kt b/navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.js.kt similarity index 100% rename from compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.js.kt rename to navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavGraphBuilder.js.kt diff --git a/compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.js.kt b/navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.js.kt similarity index 100% rename from compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.js.kt rename to navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.js.kt diff --git a/compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.js.kt b/navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.js.kt similarity index 100% rename from compose-multiplatform-navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.js.kt rename to navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHostController.js.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index c5dfdfa9..919f9791 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,15 +1,20 @@ -rootProject.name = "compose-multiplatform-material" +rootProject.name = "compose-multiplatform-html-unified" -include("compose-multiplatform-common") // TODO consider splitting into several modules including `foundation`, `ui`, etc. -include("compose-multiplatform-common:legacy") -project(":compose-multiplatform-common:legacy").name = "compose-multiplatform-common-legacy" -include("compose-multiplatform-material-icons-core") -include("compose-multiplatform-material2") -include("compose-multiplatform-material3") -include("compose-multiplatform-navigation") -include("compose-multiplatform-lifecycle-viewmodel") +include("common") // TODO consider splitting into several modules including `foundation`, `ui`, etc. (#45) +include("common:legacy") +include("material-icons-core") +include("material2") +include("material3") +include("navigation") +include("lifecycle-viewmodel") include("demo") +fun ProjectDescriptor.setProjectConcatenatedNames(prefix: String) { + name = prefix + name + for (child in children) + child.setProjectConcatenatedNames("$name-") +} +rootProject.setProjectConcatenatedNames("") /* // This seems not needed.