From e0a9bd272fa59e45582b8c78f1fc7207a72c4fa8 Mon Sep 17 00:00:00 2001 From: YvesKalume Date: Mon, 8 Aug 2022 16:17:25 +0200 Subject: [PATCH 1/3] fix bottom space on forYou's NewsFeed last item --- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 8a97d2336..b98b129d9 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -28,13 +28,13 @@ import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.consumedWindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.windowInsetsBottomHeight import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.lazy.LazyColumn @@ -43,7 +43,6 @@ import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.grid.rememberLazyGridState -import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape @@ -219,7 +218,7 @@ fun ForYouScreen( ) item { - Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing)) + Spacer(modifier = Modifier.height(8.dp)) } } } From 21926339da173ceb9d4ad5f309993d823c965fe3 Mon Sep 17 00:00:00 2001 From: YvesKalume Date: Mon, 8 Aug 2022 19:35:22 +0200 Subject: [PATCH 2/3] fix : put back inset support --- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index b98b129d9..02ac7fe40 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -35,6 +35,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.windowInsetsBottomHeight import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.lazy.LazyColumn @@ -220,6 +221,10 @@ fun ForYouScreen( item { Spacer(modifier = Modifier.height(8.dp)) } + + item { + Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing)) + } } } } From ee47642fe3899cc6fbbd37710cd15dd9c9db6bc8 Mon Sep 17 00:00:00 2001 From: YvesKalume Date: Wed, 17 Aug 2022 06:37:35 +0200 Subject: [PATCH 3/3] fix : put spacers in one item and fill up the entire span --- .../apps/nowinandroid/feature/foryou/ForYouScreen.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 42f6bfc29..4e0668027 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -48,7 +48,6 @@ import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.grid.rememberLazyGridState -import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ExperimentalMaterial3Api @@ -205,11 +204,9 @@ fun ForYouScreen( loadingContentDescription = R.string.for_you_loading ) - item { + item(span = { GridItemSpan(maxLineSpan) }) { + Column { Spacer(modifier = Modifier.height(8.dp)) - } - - item { Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.safeDrawing)) } }