Skip to content

Commit c651f9a

Browse files
authored
Merge pull request #31 from Kotlin/padding-todo-fix
Fix padding TODO
2 parents 52b3d1a + 2d11351 commit c651f9a

File tree

1 file changed

+2
-12
lines changed
  • composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens

1 file changed

+2
-12
lines changed

composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/screens/ListScreen.kt

+2-12
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ import androidx.compose.foundation.clickable
66
import androidx.compose.foundation.layout.Column
77
import androidx.compose.foundation.layout.Spacer
88
import androidx.compose.foundation.layout.WindowInsets
9-
import androidx.compose.foundation.layout.WindowInsetsSides
109
import androidx.compose.foundation.layout.asPaddingValues
1110
import androidx.compose.foundation.layout.aspectRatio
1211
import androidx.compose.foundation.layout.fillMaxSize
1312
import androidx.compose.foundation.layout.fillMaxWidth
1413
import androidx.compose.foundation.layout.height
15-
import androidx.compose.foundation.layout.only
1614
import androidx.compose.foundation.layout.padding
1715
import androidx.compose.foundation.layout.safeDrawing
1816
import androidx.compose.foundation.lazy.grid.GridCells
@@ -56,16 +54,8 @@ private fun ObjectGrid(
5654
) {
5755
LazyVerticalGrid(
5856
columns = GridCells.Adaptive(180.dp),
59-
// TODO simplify padding after https://issuetracker.google.com/issues/365052672 is fixed
60-
modifier = modifier
61-
.fillMaxSize()
62-
.padding(
63-
WindowInsets.safeDrawing
64-
.only(WindowInsetsSides.Horizontal)
65-
.asPaddingValues()
66-
),
67-
contentPadding = WindowInsets.safeDrawing.only(WindowInsetsSides.Vertical)
68-
.asPaddingValues(),
57+
modifier = modifier.fillMaxSize(),
58+
contentPadding = WindowInsets.safeDrawing.asPaddingValues(),
6959
) {
7060
items(objects, key = { it.objectID }) { obj ->
7161
ObjectFrame(

0 commit comments

Comments
 (0)