Skip to content

Commit 3ce4f04

Browse files
bentrengrovebentrengrove
authored
Merge pull request #1120 from google/ben/upgrade
Compose 1.2.0-alpha07
2 parents 5e8fb86 + a50ed69 commit 3ce4f04

22 files changed

+55
-43
lines changed

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
3333

3434
GROUP=com.google.accompanist
3535
# !! No longer need to update this manually when using a Compose SNAPSHOT
36-
VERSION_NAME=0.24.6-SNAPSHOT
36+
VERSION_NAME=0.24.6-alpha
3737

3838
POM_DESCRIPTION=Utilities for Jetpack Compose
3939

‎gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
compose = "1.2.0-alpha06"
2+
compose = "1.2.0-alpha07"
33
composesnapshot = "-" # a single character = no snapshot
44

55
# gradlePlugin and lint need to be updated together

‎sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowColumnSample.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ package com.google.accompanist.sample.flowlayout
1919
import android.os.Bundle
2020
import androidx.activity.ComponentActivity
2121
import androidx.activity.compose.setContent
22+
import androidx.compose.foundation.layout.padding
2223
import androidx.compose.material.Scaffold
2324
import androidx.compose.material.Text
2425
import androidx.compose.material.TopAppBar
26+
import androidx.compose.ui.Modifier
2527
import androidx.compose.ui.res.stringResource
2628
import com.google.accompanist.flowlayout.FlowColumn
2729
import com.google.accompanist.sample.AccompanistSampleTheme
@@ -38,8 +40,8 @@ class FlowColumnSample : ComponentActivity() {
3840
title = { Text(text = stringResource(R.string.flowlayout_title_column)) }
3941
)
4042
}
41-
) {
42-
FlowColumn {
43+
) { padding ->
44+
FlowColumn(Modifier.padding(padding)) {
4345
SampleContent()
4446
}
4547
}

‎sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowRowSample.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ package com.google.accompanist.sample.flowlayout
1919
import android.os.Bundle
2020
import androidx.activity.ComponentActivity
2121
import androidx.activity.compose.setContent
22+
import androidx.compose.foundation.layout.padding
2223
import androidx.compose.material.Scaffold
2324
import androidx.compose.material.Text
2425
import androidx.compose.material.TopAppBar
26+
import androidx.compose.ui.Modifier
2527
import androidx.compose.ui.res.stringResource
2628
import com.google.accompanist.flowlayout.FlowRow
2729
import com.google.accompanist.sample.AccompanistSampleTheme
@@ -38,8 +40,8 @@ class FlowRowSample : ComponentActivity() {
3840
title = { Text(text = stringResource(R.string.flowlayout_title_row)) }
3941
)
4042
}
41-
) {
42-
FlowRow {
43+
) { padding ->
44+
FlowRow(Modifier.padding(padding)) {
4345
SampleContent()
4446
}
4547
}

‎sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerBasicSample.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.Row
2525
import androidx.compose.foundation.layout.aspectRatio
2626
import androidx.compose.foundation.layout.fillMaxSize
2727
import androidx.compose.foundation.layout.fillMaxWidth
28+
import androidx.compose.foundation.layout.padding
2829
import androidx.compose.material.Icon
2930
import androidx.compose.material.IconButton
3031
import androidx.compose.material.MaterialTheme
@@ -76,8 +77,8 @@ private fun Sample() {
7677
)
7778
},
7879
modifier = Modifier.fillMaxSize()
79-
) {
80-
Column(Modifier.fillMaxSize()) {
80+
) { padding ->
81+
Column(Modifier.fillMaxSize().padding(padding)) {
8182
val pagerState = rememberPagerState()
8283

8384
// Display 10 items

‎sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerDifferentPaddingsSample.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.accompanist.sample.pager
1818

19+
import android.annotation.SuppressLint
1920
import android.os.Bundle
2021
import androidx.activity.ComponentActivity
2122
import androidx.activity.compose.setContent
@@ -61,7 +62,7 @@ class HorizontalPagerDifferentPaddingsSample : ComponentActivity() {
6162
}
6263
}
6364

64-
@OptIn(ExperimentalPagerApi::class)
65+
@SuppressLint("UnusedMaterialScaffoldPaddingParameter") // Sample deals with paddings itself
6566
@Composable
6667
private fun Sample() {
6768
Scaffold(

‎sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerLoopingSample.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.PaddingValues
2424
import androidx.compose.foundation.layout.aspectRatio
2525
import androidx.compose.foundation.layout.fillMaxSize
2626
import androidx.compose.foundation.layout.fillMaxWidth
27+
import androidx.compose.foundation.layout.padding
2728
import androidx.compose.material.MaterialTheme
2829
import androidx.compose.material.Scaffold
2930
import androidx.compose.material.Surface
@@ -65,8 +66,8 @@ private fun Sample() {
6566
)
6667
},
6768
modifier = Modifier.fillMaxSize()
68-
) {
69-
Column(Modifier.fillMaxSize()) {
69+
) { padding ->
70+
Column(Modifier.fillMaxSize().padding(padding)) {
7071
// Display 10 items
7172
val pageCount = 10
7273

‎sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerScrollingContentSample.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.aspectRatio
2727
import androidx.compose.foundation.layout.fillMaxHeight
2828
import androidx.compose.foundation.layout.fillMaxSize
2929
import androidx.compose.foundation.layout.fillMaxWidth
30+
import androidx.compose.foundation.layout.padding
3031
import androidx.compose.foundation.rememberScrollState
3132
import androidx.compose.material.MaterialTheme
3233
import androidx.compose.material.Scaffold
@@ -69,8 +70,8 @@ private fun Sample() {
6970
)
7071
},
7172
modifier = Modifier.fillMaxSize()
72-
) {
73-
Column(Modifier.fillMaxSize()) {
73+
) { padding ->
74+
Column(Modifier.fillMaxSize().padding(padding)) {
7475
val pagerState = rememberPagerState()
7576

7677
// Display 10 items

‎sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTabsSample.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.Column
2424
import androidx.compose.foundation.layout.PaddingValues
2525
import androidx.compose.foundation.layout.fillMaxSize
2626
import androidx.compose.foundation.layout.fillMaxWidth
27+
import androidx.compose.foundation.layout.padding
2728
import androidx.compose.material.Card
2829
import androidx.compose.material.MaterialTheme
2930
import androidx.compose.material.Scaffold
@@ -73,12 +74,12 @@ private fun Sample() {
7374
)
7475
},
7576
modifier = Modifier.fillMaxSize()
76-
) {
77+
) { padding ->
7778
val pages = remember {
7879
listOf("Home", "Shows", "Movies", "Books", "Really long movies", "Short audiobooks")
7980
}
8081

81-
Column(Modifier.fillMaxSize()) {
82+
Column(Modifier.fillMaxSize().padding(padding)) {
8283
val coroutineScope = rememberCoroutineScope()
8384

8485
// Remember a PagerState

‎sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTransitionSample.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@ private fun Sample() {
7979
)
8080
},
8181
modifier = Modifier.fillMaxSize()
82-
) {
83-
HorizontalPagerWithOffsetTransition()
82+
) { padding ->
83+
HorizontalPagerWithOffsetTransition(Modifier.padding(padding))
8484
}
8585
}
8686

8787
@OptIn(ExperimentalPagerApi::class, ExperimentalCoilApi::class)
8888
@Composable
89-
fun HorizontalPagerWithOffsetTransition() {
89+
fun HorizontalPagerWithOffsetTransition(modifier: Modifier = Modifier) {
9090
HorizontalPager(
9191
count = 10,
9292
// Add 32.dp horizontal padding to 'center' the pages
9393
contentPadding = PaddingValues(horizontal = 32.dp),
94-
modifier = Modifier.fillMaxSize()
94+
modifier = modifier.fillMaxSize()
9595
) { page ->
9696
Card(
9797
Modifier

‎sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerWithIndicatorSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ private fun Sample() {
6969
)
7070
},
7171
modifier = Modifier.fillMaxSize()
72-
) {
73-
Column(Modifier.fillMaxSize()) {
72+
) { padding ->
73+
Column(Modifier.fillMaxSize().padding(padding)) {
7474
val pagerState = rememberPagerState()
7575

7676
// Display 10 items

‎sample/src/main/java/com/google/accompanist/sample/pager/NestedPagersSample.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.activity.compose.setContent
2222
import androidx.compose.foundation.layout.aspectRatio
2323
import androidx.compose.foundation.layout.fillMaxSize
2424
import androidx.compose.foundation.layout.fillMaxWidth
25+
import androidx.compose.foundation.layout.padding
2526
import androidx.compose.material.MaterialTheme
2627
import androidx.compose.material.Scaffold
2728
import androidx.compose.material.Surface
@@ -61,10 +62,10 @@ private fun Sample() {
6162
)
6263
},
6364
modifier = Modifier.fillMaxSize()
64-
) {
65+
) { padding ->
6566
VerticalPager(
6667
count = 10,
67-
modifier = Modifier.fillMaxSize(),
68+
modifier = Modifier.fillMaxSize().padding(padding),
6869
) {
6970
HorizontalPager(
7071
count = 5,

‎sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerBasicSample.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.Column
2323
import androidx.compose.foundation.layout.PaddingValues
2424
import androidx.compose.foundation.layout.fillMaxHeight
2525
import androidx.compose.foundation.layout.fillMaxSize
26+
import androidx.compose.foundation.layout.padding
2627
import androidx.compose.material.MaterialTheme
2728
import androidx.compose.material.Scaffold
2829
import androidx.compose.material.Surface
@@ -64,8 +65,8 @@ private fun Sample() {
6465
)
6566
},
6667
modifier = Modifier.fillMaxSize()
67-
) {
68-
Column(Modifier.fillMaxSize()) {
68+
) { padding ->
69+
Column(Modifier.fillMaxSize().padding(padding)) {
6970
val pagerState = rememberPagerState()
7071

7172
// Display 10 items

‎sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerWithIndicatorSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ private fun Sample() {
6767
)
6868
},
6969
modifier = Modifier.fillMaxSize()
70-
) {
70+
) { padding ->
7171
Column(Modifier.fillMaxSize()) {
7272
val pagerState = rememberPagerState()
7373

7474
Row(
7575
verticalAlignment = Alignment.CenterVertically,
76-
modifier = Modifier.weight(1f),
76+
modifier = Modifier.weight(1f).padding(padding),
7777
) {
7878
// Display 10 items
7979
VerticalPager(

‎sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderBasicSample.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import android.os.Bundle
2020
import androidx.activity.ComponentActivity
2121
import androidx.activity.compose.setContent
2222
import androidx.compose.foundation.layout.fillMaxSize
23+
import androidx.compose.foundation.layout.padding
2324
import androidx.compose.foundation.lazy.LazyColumn
2425
import androidx.compose.material.MaterialTheme
2526
import androidx.compose.material.Scaffold
@@ -69,7 +70,7 @@ private fun Sample() {
6970
)
7071
},
7172
modifier = Modifier.fillMaxSize()
72-
) {
73+
) { padding ->
7374
// Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would
7475
// come from a ViewModel or similar
7576
var refreshing by remember { mutableStateOf(false) }
@@ -84,7 +85,7 @@ private fun Sample() {
8485
state = rememberSwipeRefreshState(isRefreshing = refreshing),
8586
onRefresh = { refreshing = true },
8687
) {
87-
LazyColumn {
88+
LazyColumn(contentPadding = padding) {
8889
if (refreshing.not()) {
8990
item {
9091
ListItem(

‎sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderFadeSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private fun Sample() {
7171
)
7272
},
7373
modifier = Modifier.fillMaxSize()
74-
) {
74+
) { padding ->
7575
// Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would
7676
// come from a ViewModel or similar
7777
var refreshing by remember { mutableStateOf(false) }
@@ -86,7 +86,7 @@ private fun Sample() {
8686
state = rememberSwipeRefreshState(isRefreshing = refreshing),
8787
onRefresh = { refreshing = true },
8888
) {
89-
LazyColumn {
89+
LazyColumn(contentPadding = padding) {
9090
if (refreshing.not()) {
9191
item {
9292
ListItem(

‎sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderShimmerSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private fun Sample() {
7171
)
7272
},
7373
modifier = Modifier.fillMaxSize()
74-
) {
74+
) { padding ->
7575
// Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would
7676
// come from a ViewModel or similar
7777
var refreshing by remember { mutableStateOf(false) }
@@ -86,7 +86,7 @@ private fun Sample() {
8686
state = rememberSwipeRefreshState(isRefreshing = refreshing),
8787
onRefresh = { refreshing = true },
8888
) {
89-
LazyColumn {
89+
LazyColumn(contentPadding = padding) {
9090
if (refreshing.not()) {
9191
item {
9292
ListItem(

‎sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshBasicSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private fun Sample() {
7373
)
7474
},
7575
modifier = Modifier.fillMaxSize()
76-
) {
76+
) { padding ->
7777
// Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would
7878
// come from a ViewModel or similar
7979
var refreshing by remember { mutableStateOf(false) }
@@ -88,7 +88,7 @@ private fun Sample() {
8888
state = rememberSwipeRefreshState(isRefreshing = refreshing),
8989
onRefresh = { refreshing = true },
9090
) {
91-
LazyColumn {
91+
LazyColumn(contentPadding = padding) {
9292
items(30) { index ->
9393
Row(Modifier.padding(16.dp)) {
9494
Image(

‎sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshCustomIndicatorSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private fun Sample() {
8181
)
8282
},
8383
modifier = Modifier.fillMaxSize()
84-
) {
84+
) { padding ->
8585
// Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would
8686
// come from a ViewModel or similar
8787
var refreshing by remember { mutableStateOf(false) }
@@ -102,7 +102,7 @@ private fun Sample() {
102102
)
103103
},
104104
) {
105-
LazyColumn {
105+
LazyColumn(contentPadding = padding) {
106106
items(30) {
107107
Row(Modifier.padding(16.dp)) {
108108
Image(

‎sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshTweakedIndicatorSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private fun Sample() {
7474
)
7575
},
7676
modifier = Modifier.fillMaxSize()
77-
) {
77+
) { padding ->
7878
// Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would
7979
// come from a ViewModel or similar
8080
var refreshing by remember { mutableStateOf(false) }
@@ -101,7 +101,7 @@ private fun Sample() {
101101
)
102102
},
103103
) {
104-
LazyColumn {
104+
LazyColumn(contentPadding = padding) {
105105
items(30) { index ->
106106
Row(Modifier.padding(16.dp)) {
107107
Image(

‎sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshVerticalPagerSample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private fun Sample() {
7979
)
8080
},
8181
modifier = Modifier.fillMaxSize()
82-
) {
82+
) { padding ->
8383
// Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would
8484
// come from a ViewModel or similar
8585
var refreshing by remember { mutableStateOf(false) }
@@ -97,7 +97,7 @@ private fun Sample() {
9797
VerticalPager(
9898
count = 10,
9999
itemSpacing = 8.dp,
100-
modifier = Modifier.fillMaxSize(),
100+
modifier = Modifier.fillMaxSize().padding(padding),
101101
) { page ->
102102
Box {
103103
// Our page content, displaying a random image

‎sample/src/main/java/com/google/accompanist/sample/systemuicontroller/SystemBarsVisibilitySample.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ private fun Sample() {
6767
)
6868
},
6969
modifier = Modifier.fillMaxSize()
70-
) {
70+
) { padding ->
7171
Column(
72-
modifier = Modifier.fillMaxSize(),
72+
modifier = Modifier.fillMaxSize().padding(padding),
7373
horizontalAlignment = Alignment.CenterHorizontally,
7474
verticalArrangement = Arrangement.Center
7575
) {

0 commit comments

Comments
 (0)