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

Unverified Commit 216350ae authored by Wolf Montwé's avatar Wolf Montwé
Browse files

Add ButtonDefaults that replaces the Material 2 one to allow changes of PaddingValues

parent eb1ffa0c

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/Button.kt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ fun Button( 
    onClick: () -> Unit,

    modifier: Modifier = Modifier,

    enabled: Boolean = true,

    contentPadding: PaddingValues = ButtonDefaults.ContentPadding,

    contentPadding: PaddingValues = buttonContentPadding(),

) {

    MaterialButton(

        onClick = onClick,

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/ButtonDefaults.kt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.atom.button



import androidx.compose.foundation.layout.PaddingValues

import androidx.compose.runtime.Composable

import app.k9mail.core.ui.compose.theme.MainTheme



@Composable

fun buttonContentPadding(): PaddingValues = PaddingValues(

    start = MainTheme.spacings.quadruple,

    top = MainTheme.spacings.default,

    end = MainTheme.spacings.quadruple,

    bottom = MainTheme.spacings.default,

)

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/ButtonOutlined.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ fun ButtonOutlined( 
    onClick: () -> Unit,

    modifier: Modifier = Modifier,

    enabled: Boolean = true,

    contentPadding: PaddingValues = ButtonDefaults.ContentPadding,

    contentPadding: PaddingValues = buttonContentPadding(),

) {

    MaterialOutlinedButton(

        onClick = onClick,

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/button/ButtonText.kt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ fun ButtonText( 
    onClick: () -> Unit,

    modifier: Modifier = Modifier,

    enabled: Boolean = true,

    contentPadding: PaddingValues = ButtonDefaults.ContentPadding,

    contentPadding: PaddingValues = buttonContentPadding(),

) {

    MaterialTextButton(

        onClick = onClick,