From de41aa64877be3df9eb94fc9769985ceaea1c76e Mon Sep 17 00:00:00 2001 From: Karthi Keyan <84800257+KarthiDreamr@users.noreply.github.com> Date: Sun, 22 Oct 2023 19:05:22 +0530 Subject: [PATCH 1/2] Update PagerSnippets.kt rectified error 1. Modifer.align(Alignment.BottomCenter) is replaced by verticalArrangement property which is no more working 2. wrong value 10 is replaced by 4 for pageCount 3. made text more visible by putting it inside a box --- .../compose/snippets/layouts/PagerSnippets.kt | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt index 85e9a454d..a0630e518 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt @@ -363,7 +363,7 @@ fun PagerWithTabs() { fun PagerIndicator() { Box { // [START android_compose_pager_indicator] - val pageCount = 10 + val pageCount = 4 val pagerState = rememberPagerState(pageCount = { 4 }) @@ -371,18 +371,20 @@ fun PagerIndicator() { state = pagerState ) { page -> // Our page content - Text( - text = "Page: $page", - modifier = Modifier - .fillMaxSize() - ) + Box( + modifier = Modifier.background(Color.Cyan).size(400.dp) + ){ + Text( + text = "Page: $page", + ) + } } Row( Modifier .height(50.dp) - .fillMaxWidth() - .align(Alignment.BottomCenter), - horizontalArrangement = Arrangement.Center + .fillMaxWidth(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.Bottom ) { repeat(pageCount) { iteration -> val color = if (pagerState.currentPage == iteration) Color.DarkGray else Color.LightGray From 589613455505ed26b9f687611d40903e0e982167 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Mon, 23 Oct 2023 13:11:28 +0100 Subject: [PATCH 2/2] fix pager snippets --- .../compose/snippets/layouts/PagerSnippets.kt | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt index a0630e518..f65c96e6d 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt @@ -36,6 +36,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.sizeIn +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.PageSize @@ -361,40 +362,36 @@ fun PagerWithTabs() { @Preview @Composable fun PagerIndicator() { - Box { + Box(modifier = Modifier.fillMaxSize()) { // [START android_compose_pager_indicator] - val pageCount = 4 val pagerState = rememberPagerState(pageCount = { 4 }) HorizontalPager( - state = pagerState + state = pagerState, + modifier = Modifier.fillMaxSize() ) { page -> // Our page content - Box( - modifier = Modifier.background(Color.Cyan).size(400.dp) - ){ - Text( - text = "Page: $page", - ) - } + Text( + text = "Page: $page", + ) } Row( Modifier - .height(50.dp) - .fillMaxWidth(), - horizontalArrangement = Arrangement.Center, - verticalAlignment = Alignment.Bottom + .wrapContentHeight() + .fillMaxWidth() + .align(Alignment.BottomCenter) + .padding(bottom = 8.dp), + horizontalArrangement = Arrangement.Center ) { - repeat(pageCount) { iteration -> + repeat(pagerState.pageCount) { iteration -> val color = if (pagerState.currentPage == iteration) Color.DarkGray else Color.LightGray Box( modifier = Modifier .padding(2.dp) .clip(CircleShape) .background(color) - .size(20.dp) - + .size(16.dp) ) } }