diff --git a/gradle.properties b/gradle.properties index 2275bbfe7..e5fdd6501 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000 GROUP=com.google.accompanist # !! No longer need to update this manually when using a Compose SNAPSHOT -VERSION_NAME=0.24.6-SNAPSHOT +VERSION_NAME=0.24.6-alpha POM_DESCRIPTION=Utilities for Jetpack Compose diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2aee8abef..51f0fed16 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -compose = "1.2.0-alpha06" +compose = "1.2.0-alpha07" composesnapshot = "-" # a single character = no snapshot # gradlePlugin and lint need to be updated together diff --git a/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowColumnSample.kt b/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowColumnSample.kt index 5d0ca555c..874f2755c 100644 --- a/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowColumnSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowColumnSample.kt @@ -19,9 +19,11 @@ package com.google.accompanist.sample.flowlayout import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.padding import androidx.compose.material.Scaffold import androidx.compose.material.Text import androidx.compose.material.TopAppBar +import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import com.google.accompanist.flowlayout.FlowColumn import com.google.accompanist.sample.AccompanistSampleTheme @@ -38,8 +40,8 @@ class FlowColumnSample : ComponentActivity() { title = { Text(text = stringResource(R.string.flowlayout_title_column)) } ) } - ) { - FlowColumn { + ) { padding -> + FlowColumn(Modifier.padding(padding)) { SampleContent() } } diff --git a/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowRowSample.kt b/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowRowSample.kt index 281955451..ef5d44b46 100644 --- a/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowRowSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/flowlayout/FlowRowSample.kt @@ -19,9 +19,11 @@ package com.google.accompanist.sample.flowlayout import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.padding import androidx.compose.material.Scaffold import androidx.compose.material.Text import androidx.compose.material.TopAppBar +import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.sample.AccompanistSampleTheme @@ -38,8 +40,8 @@ class FlowRowSample : ComponentActivity() { title = { Text(text = stringResource(R.string.flowlayout_title_row)) } ) } - ) { - FlowRow { + ) { padding -> + FlowRow(Modifier.padding(padding)) { SampleContent() } } diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerBasicSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerBasicSample.kt index f7ef15861..f25930784 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerBasicSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerBasicSample.kt @@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.Icon import androidx.compose.material.IconButton import androidx.compose.material.MaterialTheme @@ -76,8 +77,8 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { - Column(Modifier.fillMaxSize()) { + ) { padding -> + Column(Modifier.fillMaxSize().padding(padding)) { val pagerState = rememberPagerState() // Display 10 items diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerDifferentPaddingsSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerDifferentPaddingsSample.kt index c83900e00..6c542ad38 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerDifferentPaddingsSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerDifferentPaddingsSample.kt @@ -16,6 +16,7 @@ package com.google.accompanist.sample.pager +import android.annotation.SuppressLint import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent @@ -61,7 +62,7 @@ class HorizontalPagerDifferentPaddingsSample : ComponentActivity() { } } -@OptIn(ExperimentalPagerApi::class) +@SuppressLint("UnusedMaterialScaffoldPaddingParameter") // Sample deals with paddings itself @Composable private fun Sample() { Scaffold( diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerLoopingSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerLoopingSample.kt index 7276cd99a..6ee585462 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerLoopingSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerLoopingSample.kt @@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface @@ -65,8 +66,8 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { - Column(Modifier.fillMaxSize()) { + ) { padding -> + Column(Modifier.fillMaxSize().padding(padding)) { // Display 10 items val pageCount = 10 diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerScrollingContentSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerScrollingContentSample.kt index b476c6b92..8a1964c2e 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerScrollingContentSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerScrollingContentSample.kt @@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold @@ -69,8 +70,8 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { - Column(Modifier.fillMaxSize()) { + ) { padding -> + Column(Modifier.fillMaxSize().padding(padding)) { val pagerState = rememberPagerState() // Display 10 items diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTabsSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTabsSample.kt index f27828dbe..5c082127c 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTabsSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTabsSample.kt @@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.Card import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold @@ -73,12 +74,12 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> val pages = remember { listOf("Home", "Shows", "Movies", "Books", "Really long movies", "Short audiobooks") } - Column(Modifier.fillMaxSize()) { + Column(Modifier.fillMaxSize().padding(padding)) { val coroutineScope = rememberCoroutineScope() // Remember a PagerState diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTransitionSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTransitionSample.kt index b3cc4cac8..e752d141d 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTransitionSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerTransitionSample.kt @@ -79,19 +79,19 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { - HorizontalPagerWithOffsetTransition() + ) { padding -> + HorizontalPagerWithOffsetTransition(Modifier.padding(padding)) } } @OptIn(ExperimentalPagerApi::class, ExperimentalCoilApi::class) @Composable -fun HorizontalPagerWithOffsetTransition() { +fun HorizontalPagerWithOffsetTransition(modifier: Modifier = Modifier) { HorizontalPager( count = 10, // Add 32.dp horizontal padding to 'center' the pages contentPadding = PaddingValues(horizontal = 32.dp), - modifier = Modifier.fillMaxSize() + modifier = modifier.fillMaxSize() ) { page -> Card( Modifier diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerWithIndicatorSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerWithIndicatorSample.kt index faa24941f..73f246cc8 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerWithIndicatorSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/HorizontalPagerWithIndicatorSample.kt @@ -69,8 +69,8 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { - Column(Modifier.fillMaxSize()) { + ) { padding -> + Column(Modifier.fillMaxSize().padding(padding)) { val pagerState = rememberPagerState() // Display 10 items diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/NestedPagersSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/NestedPagersSample.kt index 0a92495b1..9fcc81711 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/NestedPagersSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/NestedPagersSample.kt @@ -22,6 +22,7 @@ import androidx.activity.compose.setContent import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface @@ -61,10 +62,10 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> VerticalPager( count = 10, - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize().padding(padding), ) { HorizontalPager( count = 5, diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerBasicSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerBasicSample.kt index 36d615341..24accb548 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerBasicSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerBasicSample.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold import androidx.compose.material.Surface @@ -64,8 +65,8 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { - Column(Modifier.fillMaxSize()) { + ) { padding -> + Column(Modifier.fillMaxSize().padding(padding)) { val pagerState = rememberPagerState() // Display 10 items diff --git a/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerWithIndicatorSample.kt b/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerWithIndicatorSample.kt index 8f363b052..e506c265f 100644 --- a/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerWithIndicatorSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/pager/VerticalPagerWithIndicatorSample.kt @@ -67,13 +67,13 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> Column(Modifier.fillMaxSize()) { val pagerState = rememberPagerState() Row( verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.weight(1f), + modifier = Modifier.weight(1f).padding(padding), ) { // Display 10 items VerticalPager( diff --git a/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderBasicSample.kt b/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderBasicSample.kt index 14322ee18..ae0e8a9f3 100644 --- a/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderBasicSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderBasicSample.kt @@ -20,6 +20,7 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold @@ -69,7 +70,7 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> // Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would // come from a ViewModel or similar var refreshing by remember { mutableStateOf(false) } @@ -84,7 +85,7 @@ private fun Sample() { state = rememberSwipeRefreshState(isRefreshing = refreshing), onRefresh = { refreshing = true }, ) { - LazyColumn { + LazyColumn(contentPadding = padding) { if (refreshing.not()) { item { ListItem( diff --git a/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderFadeSample.kt b/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderFadeSample.kt index 3d2eab857..90f8efbae 100644 --- a/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderFadeSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderFadeSample.kt @@ -71,7 +71,7 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> // Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would // come from a ViewModel or similar var refreshing by remember { mutableStateOf(false) } @@ -86,7 +86,7 @@ private fun Sample() { state = rememberSwipeRefreshState(isRefreshing = refreshing), onRefresh = { refreshing = true }, ) { - LazyColumn { + LazyColumn(contentPadding = padding) { if (refreshing.not()) { item { ListItem( diff --git a/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderShimmerSample.kt b/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderShimmerSample.kt index 4a602a7af..e88f5fd18 100644 --- a/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderShimmerSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/placeholder/PlaceholderShimmerSample.kt @@ -71,7 +71,7 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> // Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would // come from a ViewModel or similar var refreshing by remember { mutableStateOf(false) } @@ -86,7 +86,7 @@ private fun Sample() { state = rememberSwipeRefreshState(isRefreshing = refreshing), onRefresh = { refreshing = true }, ) { - LazyColumn { + LazyColumn(contentPadding = padding) { if (refreshing.not()) { item { ListItem( diff --git a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshBasicSample.kt b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshBasicSample.kt index d9efc9825..379edf118 100644 --- a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshBasicSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshBasicSample.kt @@ -73,7 +73,7 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> // Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would // come from a ViewModel or similar var refreshing by remember { mutableStateOf(false) } @@ -88,7 +88,7 @@ private fun Sample() { state = rememberSwipeRefreshState(isRefreshing = refreshing), onRefresh = { refreshing = true }, ) { - LazyColumn { + LazyColumn(contentPadding = padding) { items(30) { index -> Row(Modifier.padding(16.dp)) { Image( diff --git a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshCustomIndicatorSample.kt b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshCustomIndicatorSample.kt index 273d3587e..9c396939e 100644 --- a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshCustomIndicatorSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshCustomIndicatorSample.kt @@ -81,7 +81,7 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> // Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would // come from a ViewModel or similar var refreshing by remember { mutableStateOf(false) } @@ -102,7 +102,7 @@ private fun Sample() { ) }, ) { - LazyColumn { + LazyColumn(contentPadding = padding) { items(30) { Row(Modifier.padding(16.dp)) { Image( diff --git a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshTweakedIndicatorSample.kt b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshTweakedIndicatorSample.kt index 2de3b8b4d..00b4ff52c 100644 --- a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshTweakedIndicatorSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshTweakedIndicatorSample.kt @@ -74,7 +74,7 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> // Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would // come from a ViewModel or similar var refreshing by remember { mutableStateOf(false) } @@ -101,7 +101,7 @@ private fun Sample() { ) }, ) { - LazyColumn { + LazyColumn(contentPadding = padding) { items(30) { index -> Row(Modifier.padding(16.dp)) { Image( diff --git a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshVerticalPagerSample.kt b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshVerticalPagerSample.kt index e1cfafac7..f7afdcf93 100644 --- a/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshVerticalPagerSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/swiperefresh/SwipeRefreshVerticalPagerSample.kt @@ -79,7 +79,7 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> // Simulate a fake 2-second 'load'. Ideally this 'refreshing' value would // come from a ViewModel or similar var refreshing by remember { mutableStateOf(false) } @@ -97,7 +97,7 @@ private fun Sample() { VerticalPager( count = 10, itemSpacing = 8.dp, - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize().padding(padding), ) { page -> Box { // Our page content, displaying a random image diff --git a/sample/src/main/java/com/google/accompanist/sample/systemuicontroller/SystemBarsVisibilitySample.kt b/sample/src/main/java/com/google/accompanist/sample/systemuicontroller/SystemBarsVisibilitySample.kt index b8082a324..95643a63d 100644 --- a/sample/src/main/java/com/google/accompanist/sample/systemuicontroller/SystemBarsVisibilitySample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/systemuicontroller/SystemBarsVisibilitySample.kt @@ -67,9 +67,9 @@ private fun Sample() { ) }, modifier = Modifier.fillMaxSize() - ) { + ) { padding -> Column( - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize().padding(padding), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) {