Introduce call and emit codegen with new resolver, remove KTX completely
Change-Id: I7c7629593bc890e38d19b65f0e2607018adbf420
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
index d7a3575..cacd9d9 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
@@ -16,7 +16,7 @@
package androidx.ui.layout.test
-import androidx.compose.Children
+import androidx.compose.Composable
import androidx.compose.composer
import androidx.test.filters.SmallTest
import androidx.ui.core.Constraints
@@ -43,7 +43,7 @@
class AspectRatioModifierTest : LayoutTest() {
@Test
fun testAspectRatioModifier_intrinsicDimensions() = withDensity(density) {
- testIntrinsics(@Children {
+ testIntrinsics(@Composable {
Container(modifier = AspectRatio(2f), width = 30.dp, height = 40.dp) { }
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
assertEquals(40.ipx, minIntrinsicWidth(20.ipx))
@@ -99,7 +99,7 @@
val size = Ref<PxSize>()
val position = Ref<PxPosition>()
show {
- Layout(@Children {
+ Layout(@Composable {
Container(AspectRatio(aspectRatio)) {
SaveLayoutInfo(size, position, positionedLatch)
}
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt
index c06806f2..544e3dd 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt
@@ -19,7 +19,7 @@
package androidx.ui.layout.test
-import androidx.compose.Children
+import androidx.compose.Composable
import androidx.test.filters.SmallTest
import androidx.ui.core.Layout
import androidx.ui.core.OnChildPositioned
@@ -137,7 +137,7 @@
@Test
fun testAspectRatio_intrinsicDimensions() = withDensity(density) {
- testIntrinsics(@Children {
+ testIntrinsics(@Composable {
AspectRatio(2f) {
Container(width = 30.dp, height = 40.dp) { }
}
@@ -159,7 +159,7 @@
val size = Ref<PxSize>()
show {
Align(alignment = Alignment.TopLeft) {
- val children = @Children {
+ val children = @Composable {
AspectRatio(aspectRatio) {
SaveLayoutInfo(size, Ref<PxPosition>(), positionedLatch)
}
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
index 1c3e365..a91eef7 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
@@ -17,7 +17,6 @@
package androidx.ui.layout.test
import android.content.res.Resources
-import androidx.compose.Children
import androidx.compose.Composable
import androidx.compose.composer
import androidx.test.filters.SmallTest
@@ -89,7 +88,7 @@
val size = Ref<PxSize>()
val position = Ref<PxPosition>()
show {
- Layout(@Children {
+ Layout(@Composable {
Align(alignment = Alignment.TopLeft) {
Container(modifier = modifier) {
Container(width = Width, height = Height) { }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
index 1c76244..b9ce811 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
@@ -67,7 +67,7 @@
}
fun inflexible(children: @Composable() () -> Unit) {
- childrenList += {
+ childrenList += @Composable {
ParentData(data = FlexInfo(flex = 0f, fit = FlexFit.Loose), children = children)
}
}