Skip to content

Commit b7aa02e

Browse files
Merge pull request #73 from square/zachklipp/upgrade-compose
Upgrade Compose to latest version.
2 parents 8a6f150 + 9c7aafb commit b7aa02e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

buildSrc/src/main/java/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import java.util.Locale.US
1919
import kotlin.reflect.full.declaredMembers
2020

2121
object Versions {
22-
const val compose = "1.0.0-alpha04"
22+
const val compose = "1.0.0-alpha05"
2323
const val kotlin = "1.4.10"
2424

2525
// This *is* actually used.

samples/src/main/java/com/squareup/sample/launcher/SampleLauncherApp.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import androidx.compose.ui.input.pointer.PointerEventPass.Initial
4242
import androidx.compose.ui.layout.LayoutCoordinates
4343
import androidx.compose.ui.layout.globalBounds
4444
import androidx.compose.ui.node.Ref
45-
import androidx.compose.ui.onPositioned
45+
import androidx.compose.ui.onGloballyPositioned
4646
import androidx.compose.ui.platform.ConfigurationAmbient
4747
import androidx.compose.ui.platform.ViewAmbient
4848
import androidx.compose.ui.res.stringResource
@@ -76,8 +76,8 @@ import com.squareup.sample.R.string
7676
val rootView = ViewAmbient.current
7777

7878
/**
79-
* [androidx.ui.core.LayoutCoordinates.globalBounds] corresponds to the coordinates in the root
80-
* Android view hosting the composition.
79+
* [androidx.compose.ui.layout.LayoutCoordinates.globalBounds] corresponds to the coordinates in
80+
* the root Android view hosting the composition.
8181
*/
8282
val globalBounds = remember { Ref<Rect>() }
8383

@@ -110,7 +110,7 @@ import com.squareup.sample.R.string
110110
modifier = Modifier
111111
.height(previewHeight)
112112
.aspectRatio(screenRatio)
113-
.onPositioned(onPreviewCoordinates)
113+
.onGloballyPositioned(onPreviewCoordinates)
114114
) {
115115
// Preview the samples with a light theme, since that's what most of them use.
116116
MaterialTheme(lightColors()) {

0 commit comments

Comments
 (0)