Replace some usages of OnPositioned with onPositioned
OnPositioned and OnChildPositioned will be replaced with
onPositioned and onChildPositioned modifiers. This CL changes
some of our usages of both of them.
Test: ui-framework, ui-material, ui-test, ui-animation, ui-foundation
Change-Id: I7f6a2bc5aaf4f7e9c3a5d1c648d9611ac3897d96
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/DrawerTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/DrawerTest.kt
index bef16f7..7bf194e 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/DrawerTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/DrawerTest.kt
@@ -21,8 +21,8 @@
import androidx.compose.emptyContent
import androidx.test.filters.MediumTest
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.OnPositioned
import androidx.ui.core.TestTag
+import androidx.ui.core.onPositioned
import androidx.ui.foundation.Clickable
import androidx.ui.layout.Container
import androidx.ui.semantics.Semantics
@@ -64,10 +64,9 @@
var position: PxPosition? = null
composeTestRule.setMaterialContent {
ModalDrawerLayout(DrawerState.Opened, {}, drawerContent = {
- Container(expanded = true) {
- OnPositioned { coords ->
- position = coords.localToGlobal(PxPosition.Origin)
- }
+ Container(onPositioned { coords ->
+ position = coords.localToGlobal(PxPosition.Origin)
+ }, expanded = true) {
}
}, bodyContent = emptyContent())
}
@@ -81,10 +80,9 @@
var position: PxPosition? = null
composeTestRule.setMaterialContent {
ModalDrawerLayout(DrawerState.Closed, {}, drawerContent = {
- Container(expanded = true) {
- OnPositioned { coords ->
- position = coords.localToGlobal(PxPosition.Origin)
- }
+ Container(onPositioned { coords ->
+ position = coords.localToGlobal(PxPosition.Origin)
+ }, expanded = true) {
}
}, bodyContent = emptyContent())
}
@@ -99,10 +97,9 @@
var size: IntPxSize? = null
composeTestRule.setMaterialContent {
ModalDrawerLayout(DrawerState.Opened, {}, drawerContent = {
- Container(expanded = true) {
- OnPositioned { coords ->
- size = coords.size
- }
+ Container(onPositioned { coords ->
+ size = coords.size
+ }, expanded = true) {
}
}, bodyContent = emptyContent())
}
@@ -119,10 +116,9 @@
var position: PxPosition? = null
composeTestRule.setMaterialContent {
BottomDrawerLayout(DrawerState.Opened, {}, drawerContent = {
- Container(expanded = true) {
- OnPositioned { coords ->
- position = coords.localToGlobal(PxPosition.Origin)
- }
+ Container(onPositioned { coords ->
+ position = coords.localToGlobal(PxPosition.Origin)
+ }, expanded = true) {
}
}, bodyContent = emptyContent())
}
@@ -141,10 +137,9 @@
var position: PxPosition? = null
composeTestRule.setMaterialContent {
BottomDrawerLayout(DrawerState.Closed, {}, drawerContent = {
- Container(expanded = true) {
- OnPositioned { coords ->
- position = coords.localToGlobal(PxPosition.Origin)
- }
+ Container(onPositioned { coords ->
+ position = coords.localToGlobal(PxPosition.Origin)
+ }, expanded = true) {
}
}, bodyContent = emptyContent())
}