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

Commit 77cd55e9 authored by Davor Poznič's avatar Davor Poznič
Browse files

Replace modifier parameter in TextInput with contentType.

parent 9a47bdc4

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/molecule/input/TextInput.kt

+10 −1
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ import androidx.compose.foundation.layout.fillMaxWidth 
import androidx.compose.foundation.text.KeyboardOptions

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.autofill.ContentType

import androidx.compose.ui.semantics.contentType

import androidx.compose.ui.semantics.semantics

import app.k9mail.core.ui.compose.designsystem.atom.textfield.TextFieldOutlined



@Suppress("LongParameterList")
@@ -20,8 +23,10 @@ fun TextInput( 
    isSingleLine: Boolean = true,

    isEnabled: Boolean = true,

    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,

    contentType: ContentType? = null,

) {

    InputLayout(

        modifier = modifier,

        contentPadding = contentPadding,

        errorMessage = errorMessage,

    ) {
@@ -33,7 +38,11 @@ fun TextInput( 
            isRequired = isRequired,

            hasError = errorMessage != null,

            isSingleLine = isSingleLine,

            modifier = modifier.fillMaxWidth(),

            modifier = Modifier.fillMaxWidth().semantics {

                if (contentType != null) {

                    this.contentType = contentType

                }

            },

            keyboardOptions = keyboardOptions,

        )

    }

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/content/IncomingFormItems.kt

+1 −3
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ import androidx.compose.foundation.text.KeyboardOptions 
import androidx.compose.ui.Modifier

import androidx.compose.ui.autofill.ContentType

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.semantics.contentType

import androidx.compose.ui.semantics.semantics

import app.k9mail.core.ui.compose.designsystem.molecule.input.NumberInput

import app.k9mail.core.ui.compose.designsystem.molecule.input.SelectInput

import app.k9mail.core.ui.compose.designsystem.molecule.input.TextInput
@@ -95,13 +93,13 @@ internal fun LazyListScope.incomingFormItems( 


    item {

        TextInput(

            modifier = Modifier.semantics { contentType = ContentType.Username + ContentType.EmailAddress },

            text = state.username.value,

            errorMessage = state.username.error?.toResourceString(resources),

            onTextChange = { onEvent(Event.UsernameChanged(it)) },

            label = stringResource(id = R.string.account_server_settings_username_label),

            contentPadding = defaultItemPadding(),

            keyboardOptions = KeyboardOptions(autoCorrect = false),

            contentType = ContentType.Username + ContentType.EmailAddress,

        )

    }

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/content/OutgoingFormItems.kt

+1 −3
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ import androidx.compose.foundation.text.KeyboardOptions 
import androidx.compose.ui.Modifier

import androidx.compose.ui.autofill.ContentType

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.semantics.contentType

import androidx.compose.ui.semantics.semantics

import app.k9mail.core.ui.compose.designsystem.molecule.input.NumberInput

import app.k9mail.core.ui.compose.designsystem.molecule.input.SelectInput

import app.k9mail.core.ui.compose.designsystem.molecule.input.TextInput
@@ -86,7 +84,6 @@ internal fun LazyListScope.outgoingFormItems( 
    if (state.isUsernameFieldVisible) {

        item {

            TextInput(

                modifier = Modifier.semantics { contentType = ContentType.Username + ContentType.EmailAddress },

                text = state.username.value,

                errorMessage = state.username.error?.toResourceString(resources),

                onTextChange = { onEvent(Event.UsernameChanged(it)) },
@@ -94,6 +91,7 @@ internal fun LazyListScope.outgoingFormItems( 
                isRequired = true,

                contentPadding = defaultItemPadding(),

                keyboardOptions = KeyboardOptions(autoCorrect = false),

                contentType = ContentType.Username + ContentType.EmailAddress,

            )

        }

    }