@@ -23,10 +23,12 @@ import androidx.compose.foundation.layout.Column
2323import androidx.compose.foundation.layout.PaddingValues
2424import androidx.compose.foundation.layout.Row
2525import androidx.compose.foundation.layout.WindowInsets
26+ import androidx.compose.foundation.layout.WindowInsetsSides
2627import androidx.compose.foundation.layout.asPaddingValues
2728import androidx.compose.foundation.layout.calculateEndPadding
2829import androidx.compose.foundation.layout.calculateStartPadding
2930import androidx.compose.foundation.layout.fillMaxWidth
31+ import androidx.compose.foundation.layout.only
3032import androidx.compose.foundation.layout.padding
3133import androidx.compose.foundation.layout.safeDrawing
3234import androidx.compose.foundation.layout.size
@@ -65,12 +67,11 @@ fun ReplyListPane(
6567 onEmailClick : (Email ) -> Unit ,
6668 modifier : Modifier = Modifier
6769) {
68- val layoutDirection = LocalLayoutDirection .current
6970
7071 LazyColumn (
7172 modifier = modifier.fillMaxWidth(),
72- contentPadding = WindowInsets .safeDrawing.asPaddingValues()
73- .copy(layoutDirection, bottom = 0 .dp )
73+ contentPadding = WindowInsets .safeDrawing.only(
74+ WindowInsetsSides . Horizontal + WindowInsetsSides . Top ).asPaddingValues( )
7475 ) {
7576 item {
7677 ReplySearchBar (modifier = Modifier .fillMaxWidth())
@@ -94,9 +95,8 @@ fun ReplyDetailPane(
9495
9596 LazyColumn (
9697 modifier = modifier.fillMaxWidth(),
97- contentPadding = WindowInsets .safeDrawing.asPaddingValues()
98- .copy(layoutDirection = layoutDirection, bottom = 0 .dp)
99-
98+ contentPadding = WindowInsets .safeDrawing.only(
99+ WindowInsetsSides .Horizontal + WindowInsetsSides .Top ).asPaddingValues()
100100 ) {
101101 item {
102102 ReplyEmailThreadItem (email)
@@ -315,17 +315,3 @@ fun ReplySearchBar(modifier: Modifier = Modifier) {
315315 )
316316 }
317317}
318-
319- private fun PaddingValues.copy (
320- layoutDirection : LayoutDirection ,
321- start : Dp ? = null,
322- top : Dp ? = null,
323- end : Dp ? = null,
324- bottom : Dp ? = null,
325- ) = PaddingValues (
326- start = start ? : calculateStartPadding(layoutDirection),
327- top = top ? : calculateTopPadding(),
328- end = end ? : calculateEndPadding(layoutDirection),
329- bottom = bottom ? : calculateBottomPadding(),
330- )
331-
0 commit comments