Skip to content

Commit c1ece44

Browse files
authored
Merge pull request #594 from android/av/compose-1.4
Update to Compose Material 3 1.1.0-alpha06
2 parents 874c2d1 + 01b5f34 commit c1ece44

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
2121
import androidx.compose.foundation.layout.Row
2222
import androidx.compose.foundation.layout.WindowInsets
2323
import androidx.compose.foundation.layout.WindowInsetsSides
24-
import androidx.compose.foundation.layout.consumedWindowInsets
24+
import androidx.compose.foundation.layout.consumeWindowInsets
2525
import androidx.compose.foundation.layout.fillMaxSize
2626
import androidx.compose.foundation.layout.only
2727
import androidx.compose.foundation.layout.padding
@@ -141,7 +141,7 @@ fun NiaApp(
141141
Modifier
142142
.fillMaxSize()
143143
.padding(padding)
144-
.consumedWindowInsets(padding)
144+
.consumeWindowInsets(padding)
145145
.windowInsetsPadding(
146146
WindowInsets.safeDrawing.only(
147147
WindowInsetsSides.Horizontal,

gradle/libs.versions.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ androidGradlePlugin = "7.4.1"
55
androidxActivity = "1.6.1"
66
androidxAppCompat = "1.5.1"
77
androidxBrowser = "1.4.0"
8-
androidxComposeBom = "2022.12.00"
9-
androidxComposeCompiler = "1.4.0"
8+
androidxComposeBom = "2023.01.00"
9+
androidxComposeCompiler = "1.4.1"
10+
androidxComposeMaterial3 = "1.1.0-alpha06"
1011
androidxComposeRuntimeTracing = "1.0.0-alpha01"
1112
androidxCore = "1.9.0"
1213
androidxCoreSplashscreen = "1.0.0"
@@ -64,8 +65,8 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi
6465
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
6566
androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
6667
androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
67-
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
68-
androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
68+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
69+
androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "androidxComposeMaterial3" }
6970
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
7071
androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" }
7172
androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }

0 commit comments

Comments
 (0)