Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4ed2ffb authored by Timur Erofeev's avatar Timur Erofeev
Browse files

Apply PaddingValues to ResponsiveWidthContainer and ResponsiveContent direct children.

parent 2791c28b

core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/template/ResponsiveContentPreview.kt

+3 −2
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.template



import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
@@ -13,10 +14,10 @@ import app.k9mail.core.ui.compose.theme2.MainTheme 
internal fun ResponsiveContentPreview() {

    PreviewWithTheme {

        Surface {

            ResponsiveContent {

            ResponsiveContent { contentPadding ->

                Surface(

                    color = MainTheme.colors.info,

                    modifier = Modifier.fillMaxSize(),

                    modifier = Modifier.fillMaxSize().padding(contentPadding),

                ) {}

            }

        }

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/template/ResponsiveContentWithSurface.kt

+3 −2
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.template



import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import app.k9mail.core.ui.compose.designsystem.atom.Surface
@@ -16,9 +17,9 @@ fun ResponsiveContentWithSurface( 
    modifier: Modifier = Modifier,

    content: @Composable () -> Unit,

) {

    ResponsiveContent {

    ResponsiveContent { contentPadding ->

        Surface(

            modifier = modifier,

            modifier = modifier.padding(contentPadding),

            color = MainTheme.colors.surface,

        ) {

            content()

core/ui/compose/preference/src/main/kotlin/net/thunderbird/core/ui/compose/preference/ui/PreferenceViewWithDialog.kt

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ internal fun PreferenceViewWithDialog( 
        },

        modifier = modifier,

    ) { innerPadding ->

        ResponsiveWidthContainer { horizontalPadding ->

        ResponsiveWidthContainer { contentPadding ->

            PreferenceList(

                preferences = preferences,

                onItemClick = { index, _ ->
@@ -49,7 +49,7 @@ internal fun PreferenceViewWithDialog( 
                onPreferenceChange = onPreferenceChange,

                modifier = Modifier

                    .padding(innerPadding)

                    .padding(horizontalPadding),

                    .padding(contentPadding),

            )

        }

    }

feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/AppTitleTopHeader.kt

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ fun AppTitleTopHeader( 
                bottom = MainTheme.spacings.default,

            )

            .then(modifier),

    ) {

    ) { contentPadding ->

        Row(

            modifier = Modifier

                .fillMaxWidth()
@@ -38,6 +38,7 @@ fun AppTitleTopHeader( 
                    start = MainTheme.spacings.half,

                    end = MainTheme.spacings.quadruple,

                )

                .padding(contentPadding)

                .then(modifier),

            horizontalArrangement = Arrangement.Center,

            verticalAlignment = Alignment.CenterVertically,

feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/ContentListView.kt

+2 −1
Original line number Diff line number Diff line
@@ -27,11 +27,12 @@ fun ContentListView( 
            .padding(contentPadding)

            .fillMaxWidth()

            .then(modifier),

    ) {

    ) { contentPadding ->

        LazyColumn(

            modifier = Modifier

                .fillMaxSize()

                .imePadding(),

            contentPadding = contentPadding,

            horizontalAlignment = horizontalAlignment,

            verticalArrangement = verticalArrangement,

        ) {