Skip to content

Commit bf8e956

Browse files
ShreckYeShreckYe
committed
Replace occurrences of "Androidx" with "ComposeUi" too, and revert some unnecessary changes
1 parent 1d18919 commit bf8e956

File tree

28 files changed

+62
-62
lines changed

28 files changed

+62
-62
lines changed

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ The components in the `ext` packages don't follow the `androidx.compose` APIs ex
109109

110110
#### About parameter names
111111

112-
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
113-
`androidx.compose` platforms.
112+
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 Compose UI platforms.
114113

115114
#### Material Icons
116115

‎common/api/compose-multiplatform-html-unified-common.klib.api

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,12 +1017,12 @@ final val com.huanshankeji.compose.foundation.layout/com_huanshankeji_compose_fo
10171017
final val com.huanshankeji.compose.foundation/com_huanshankeji_compose_foundation_ScrollState$stableprop // com.huanshankeji.compose.foundation/com_huanshankeji_compose_foundation_ScrollState$stableprop|#static{}com_huanshankeji_compose_foundation_ScrollState$stableprop[0]
10181018

10191019
// Targets: [js]
1020-
final val com.huanshankeji.compose.foundation/imitateAndroidxLayoutHorizontalScrollPlatformModifier // com.huanshankeji.compose.foundation/imitateAndroidxLayoutHorizontalScrollPlatformModifier|{}imitateAndroidxLayoutHorizontalScrollPlatformModifier[0]
1021-
final fun <get-imitateAndroidxLayoutHorizontalScrollPlatformModifier>(): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.compose.foundation/imitateAndroidxLayoutHorizontalScrollPlatformModifier.<get-imitateAndroidxLayoutHorizontalScrollPlatformModifier>|<get-imitateAndroidxLayoutHorizontalScrollPlatformModifier>(){}[0]
1020+
final val com.huanshankeji.compose.foundation/imitateComposeUiLayoutHorizontalScrollPlatformModifier // com.huanshankeji.compose.foundation/imitateComposeUiLayoutHorizontalScrollPlatformModifier|{}imitateComposeUiLayoutHorizontalScrollPlatformModifier[0]
1021+
final fun <get-imitateComposeUiLayoutHorizontalScrollPlatformModifier>(): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.compose.foundation/imitateComposeUiLayoutHorizontalScrollPlatformModifier.<get-imitateComposeUiLayoutHorizontalScrollPlatformModifier>|<get-imitateComposeUiLayoutHorizontalScrollPlatformModifier>(){}[0]
10221022

10231023
// Targets: [js]
1024-
final val com.huanshankeji.compose.foundation/imitateAndroidxLayoutVerticalScrollPlatformModifier // com.huanshankeji.compose.foundation/imitateAndroidxLayoutVerticalScrollPlatformModifier|{}imitateAndroidxLayoutVerticalScrollPlatformModifier[0]
1025-
final fun <get-imitateAndroidxLayoutVerticalScrollPlatformModifier>(): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.compose.foundation/imitateAndroidxLayoutVerticalScrollPlatformModifier.<get-imitateAndroidxLayoutVerticalScrollPlatformModifier>|<get-imitateAndroidxLayoutVerticalScrollPlatformModifier>(){}[0]
1024+
final val com.huanshankeji.compose.foundation/imitateComposeUiLayoutVerticalScrollPlatformModifier // com.huanshankeji.compose.foundation/imitateComposeUiLayoutVerticalScrollPlatformModifier|{}imitateComposeUiLayoutVerticalScrollPlatformModifier[0]
1025+
final fun <get-imitateComposeUiLayoutVerticalScrollPlatformModifier>(): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.compose.foundation/imitateComposeUiLayoutVerticalScrollPlatformModifier.<get-imitateComposeUiLayoutVerticalScrollPlatformModifier>|<get-imitateComposeUiLayoutVerticalScrollPlatformModifier>(){}[0]
10261026

10271027
// Targets: [js]
10281028
final fun (androidx.compose.ui.unit/Dp).com.huanshankeji.compose.ui.unit/toPx(): org.jetbrains.compose.web.css/CSSSizeValue<org.jetbrains.compose.web.css/CSSUnit.px> // com.huanshankeji.compose.ui.unit/toPx|[email protected](){}[0]
@@ -1064,7 +1064,7 @@ final fun (com.varabyte.kobweb.compose.ui/Modifier).com.huanshankeji.compose.fou
10641064
final fun (com.varabyte.kobweb.compose.ui/Modifier).com.huanshankeji.compose.ui/toCommonModifier(): com.huanshankeji.compose.ui/Modifier.Impl // com.huanshankeji.compose.ui/toCommonModifier|[email protected](){}[0]
10651065

10661066
// Targets: [js]
1067-
final fun (com.varabyte.kobweb.compose.ui/Modifier).com.huanshankeji.kobweb.compose.ui.modifiers/imitateAndroidxLayout(): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.kobweb.compose.ui.modifiers/imitateAndroidxLayout|imitateAndroidxLayout@com.varabyte.kobweb.compose.ui.Modifier(){}[0]
1067+
final fun (com.varabyte.kobweb.compose.ui/Modifier).com.huanshankeji.kobweb.compose.ui.modifiers/imitateComposeUiLayout(): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.kobweb.compose.ui.modifiers/imitateComposeUiLayout|imitateComposeUiLayout@com.varabyte.kobweb.compose.ui.Modifier(){}[0]
10681068

10691069
// Targets: [js]
10701070
final fun (com.varabyte.kobweb.compose.ui/Modifier).com.huanshankeji.kobweb.compose.ui.modifiers/size(com.varabyte.kobweb.compose.css/Width, com.varabyte.kobweb.compose.css/Height): com.varabyte.kobweb.compose.ui/Modifier // com.huanshankeji.kobweb.compose.ui.modifiers/size|[email protected](com.varabyte.kobweb.compose.css.Width;com.varabyte.kobweb.compose.css.Height){}[0]

‎common/src/commonMain/kotlin/com/huanshankeji/compose/foundation/ext/MatchPositionRelativeParentJsOnly.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.huanshankeji.compose.ui.Modifier
44

55
/*
66
const val MATCH_POSITION_RELATIVE_PARENT_DEPRECATED_MESSAGE =
7-
"This function's functionality is replaced by `imitateAndroidxLayout`."
7+
"This function's functionality is replaced by `imitateComposeUiLayout`."
88
*/
99

1010

‎common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Scroll.js.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.huanshankeji.compose.foundation.layout.ext.KobwebBox
1010
import com.huanshankeji.compose.ui.Alignment
1111
import com.huanshankeji.compose.ui.Modifier
1212
import com.huanshankeji.compose.ui.PlatformModifier
13-
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateAndroidxLayout
13+
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateComposeUiLayout
1414
import com.varabyte.kobweb.compose.ui.styleModifier
1515

1616
fun PlatformModifier.verticalScroll() =
@@ -19,8 +19,9 @@ fun PlatformModifier.verticalScroll() =
1919
fun PlatformModifier.horizontalScroll() =
2020
styleModifier { horizontalScroll() }
2121

22-
val imitateAndroidxLayoutVerticalScrollPlatformModifier = PlatformModifier.imitateAndroidxLayout().verticalScroll()
23-
val imitateAndroidxLayoutHorizontalScrollPlatformModifier = PlatformModifier.imitateAndroidxLayout().horizontalScroll()
22+
val imitateComposeUiLayoutVerticalScrollPlatformModifier = PlatformModifier.imitateComposeUiLayout().verticalScroll()
23+
val imitateComposeUiLayoutHorizontalScrollPlatformModifier =
24+
PlatformModifier.imitateComposeUiLayout().horizontalScroll()
2425

2526

2627
@Composable

‎common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Box.js.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.huanshankeji.compose.ui.Alignment
88
import com.huanshankeji.compose.ui.Modifier
99
import com.huanshankeji.compose.ui.PlatformModifier
1010
import com.huanshankeji.compose.ui.toCommonModifier
11-
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateAndroidxLayout
11+
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateComposeUiLayout
1212
import com.varabyte.kobweb.compose.foundation.layout.LayoutScopeMarker
1313
import com.varabyte.kobweb.compose.foundation.layout.BoxScope as PlatformBoxScope
1414

@@ -19,14 +19,14 @@ actual fun Box(
1919
content: @Composable BoxScope.() -> Unit
2020
) =
2121
KobwebBox(
22-
PlatformModifier.imitateAndroidxLayout().toCommonModifier().then(modifier),
22+
PlatformModifier.imitateComposeUiLayout().toCommonModifier().then(modifier),
2323
contentAlignment,
2424
content
2525
)
2626

2727
@Composable
2828
actual fun Box(modifier: Modifier) =
29-
KobwebBox(PlatformModifier.imitateAndroidxLayout().then(modifier.platformModifier))
29+
KobwebBox(PlatformModifier.imitateComposeUiLayout().then(modifier.platformModifier))
3030

3131
@LayoutScopeMarker
3232
@Immutable

‎common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Column.js.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Stable
66
import com.huanshankeji.compose.ui.Alignment
77
import com.huanshankeji.compose.ui.Modifier
88
import com.huanshankeji.compose.ui.PlatformModifier
9-
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateAndroidxLayout
9+
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateComposeUiLayout
1010
import com.varabyte.kobweb.compose.foundation.layout.LayoutScopeMarker
1111

1212
@Composable
@@ -19,7 +19,7 @@ actual fun Column(
1919
AddKobwebComposeStyleSheet()
2020
com.varabyte.kobweb.compose.foundation.layout.Column(
2121
PlatformModifier
22-
.imitateAndroidxLayout() // "fit-content" is added to make it consistent with the `androidx` one
22+
.imitateComposeUiLayout() // "fit-content" is added to make it consistent with the `androidx` one
2323
.stylesFrom(verticalArrangement)
2424
.then(modifier.platformModifier),
2525
verticalArrangement.platformValue,

‎common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/Row.js.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Stable
66
import com.huanshankeji.compose.ui.Alignment
77
import com.huanshankeji.compose.ui.Modifier
88
import com.huanshankeji.compose.ui.PlatformModifier
9-
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateAndroidxLayout
9+
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateComposeUiLayout
1010
import com.varabyte.kobweb.compose.foundation.layout.LayoutScopeMarker
1111

1212
@Composable
@@ -19,7 +19,7 @@ actual fun Row(
1919
AddKobwebComposeStyleSheet()
2020
com.varabyte.kobweb.compose.foundation.layout.Row(
2121
PlatformModifier
22-
.imitateAndroidxLayout()
22+
.imitateComposeUiLayout()
2323
.stylesFrom(horizontalArrangement)
2424
.then(modifier.platformModifier),
2525
horizontalArrangement.platformValue,

‎common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/layout/ext/Box.js.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.huanshankeji.compose.foundation.layout.AddKobwebComposeStyleSheet
55
import com.huanshankeji.compose.foundation.layout.BoxScope
66
import com.huanshankeji.compose.ui.CommonModifier
77
import com.huanshankeji.compose.ui.PlatformModifier
8-
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateAndroidxLayout
8+
import com.huanshankeji.kobweb.compose.ui.modifiers.imitateComposeUiLayout
99
import com.varabyte.kobweb.compose.dom.ElementRefScope
1010
import com.varabyte.kobweb.compose.foundation.layout.Box
1111
import com.varabyte.kobweb.compose.ui.toAttrs
@@ -19,7 +19,7 @@ import com.varabyte.kobweb.compose.foundation.layout.BoxScope as PlatformBoxScop
1919
import com.varabyte.kobweb.compose.ui.Alignment as PlatformAlignment
2020

2121
/**
22-
* Delegates to [Box] without [com.varabyte.kobweb.compose.ui.Modifier.imitateAndroidxLayout].
22+
* Delegates to [Box] without [com.varabyte.kobweb.compose.ui.Modifier.imitateComposeUiLayout].
2323
*/
2424
@Composable
2525
fun KobwebBox(
@@ -43,7 +43,7 @@ fun KobwebBox(
4343
}
4444

4545
/**
46-
* Delegates to [Div] without [com.varabyte.kobweb.compose.ui.Modifier.imitateAndroidxLayout].
46+
* Delegates to [Div] without [com.varabyte.kobweb.compose.ui.Modifier.imitateComposeUiLayout].
4747
*/
4848
@Composable
4949
fun DivBox(

‎common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.js.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.huanshankeji.compose.foundation.lazy
22

33
import androidx.compose.runtime.Composable
4-
import com.huanshankeji.compose.foundation.imitateAndroidxLayoutHorizontalScrollPlatformModifier
5-
import com.huanshankeji.compose.foundation.imitateAndroidxLayoutVerticalScrollPlatformModifier
4+
import com.huanshankeji.compose.foundation.imitateComposeUiLayoutHorizontalScrollPlatformModifier
5+
import com.huanshankeji.compose.foundation.imitateComposeUiLayoutVerticalScrollPlatformModifier
66
import com.huanshankeji.compose.foundation.layout.*
77
import com.huanshankeji.compose.runtime.DeferredComposableRunner
88
import com.huanshankeji.compose.ui.Alignment
@@ -63,7 +63,7 @@ actual fun LazyRow(
6363
content: LazyListScope.() -> Unit
6464
) =
6565
Row(
66-
commonLazyModifier(imitateAndroidxLayoutHorizontalScrollPlatformModifier, contentPadding, modifier),
66+
commonLazyModifier(imitateComposeUiLayoutHorizontalScrollPlatformModifier, contentPadding, modifier),
6767
horizontalArrangement,
6868
verticalAlignment
6969
) {
@@ -80,7 +80,7 @@ actual fun LazyColumn(
8080
content: LazyListScope.() -> Unit
8181
) =
8282
Column(
83-
commonLazyModifier(imitateAndroidxLayoutVerticalScrollPlatformModifier, contentPadding, modifier),
83+
commonLazyModifier(imitateComposeUiLayoutVerticalScrollPlatformModifier, contentPadding, modifier),
8484
verticalArrangement,
8585
horizontalAlignment
8686
) {

‎common/src/jsMain/kotlin/com/huanshankeji/kobweb/compose/ui/modifiers/Layout.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.jetbrains.compose.web.css.maxWidth
1919
* and make the `overflow-*` CSS property / the `*Scroll` modifier work better on JS DOM.
2020
* See https://developer.android.com/develop/ui/compose/layouts/constraints-modifiers for more details.
2121
*/
22-
fun Modifier.imitateAndroidxLayout() =
22+
fun Modifier.imitateComposeUiLayout() =
2323
styleModifier {
2424
width(Width.FitContent)
2525
height(Height.FitContent)

0 commit comments

Comments
 (0)