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

Unverified Commit 58155066 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #7372 from bernhard-fp/7361_disable_autocorrect_in_server_settings 

Disable autocorrect in server settings input fields
parents b7a449ab be7310a5

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/textfield/TextFieldOutlined.kt

+4 −1
Original line number Diff line number Diff line 
package app.k9mail.core.ui.compose.designsystem.atom.textfield



import androidx.compose.foundation.text.KeyboardOptions

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.tooling.preview.Preview
@@ -21,6 +22,7 @@ fun TextFieldOutlined( 
    isRequired: Boolean = false,

    hasError: Boolean = false,

    isSingleLine: Boolean = true,

    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,

) {

    MaterialOutlinedTextField(

        value = value,
@@ -32,6 +34,7 @@ fun TextFieldOutlined( 
        readOnly = isReadOnly,

        isError = hasError,

        singleLine = isSingleLine,

        keyboardOptions = keyboardOptions,

    )

}
@@ -52,8 +55,8 @@ internal fun TextFieldOutlinedWithLabelPreview() { 
    PreviewWithThemes {

        TextFieldOutlined(

            value = "Input text",

            label = "Label",

            onValueChange = {},

            label = "Label",

        )

    }

}

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

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package app.k9mail.core.ui.compose.designsystem.molecule.input 


import androidx.compose.foundation.layout.PaddingValues

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.tooling.preview.Preview
@@ -20,6 +21,7 @@ fun TextInput( 
    contentPadding: PaddingValues = inputContentPadding(),

    isSingleLine: Boolean = true,

    isEnabled: Boolean = true,

    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,

) {

    InputLayout(

        modifier = modifier,
@@ -35,6 +37,7 @@ fun TextInput( 
            hasError = errorMessage != null,

            isSingleLine = isSingleLine,

            modifier = Modifier.fillMaxWidth(),

            keyboardOptions = keyboardOptions,

        )

    }

}

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

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import android.content.res.Resources 
import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.requiredHeight

import androidx.compose.foundation.lazy.LazyListScope

import androidx.compose.foundation.text.KeyboardOptions

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

import app.k9mail.core.ui.compose.designsystem.molecule.input.NumberInput
@@ -53,6 +54,7 @@ internal fun LazyListScope.incomingFormItems( 
            onTextChange = { onEvent(Event.ServerChanged(it)) },

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

            contentPadding = defaultItemPadding(),

            keyboardOptions = KeyboardOptions(autoCorrect = false),

        )

    }
@@ -95,6 +97,7 @@ internal fun LazyListScope.incomingFormItems( 
            onTextChange = { onEvent(Event.UsernameChanged(it)) },

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

            contentPadding = defaultItemPadding(),

            keyboardOptions = KeyboardOptions(autoCorrect = false),

        )

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import android.content.res.Resources 
import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.requiredHeight

import androidx.compose.foundation.lazy.LazyListScope

import androidx.compose.foundation.text.KeyboardOptions

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

import app.k9mail.core.ui.compose.designsystem.molecule.input.NumberInput
@@ -42,6 +43,7 @@ internal fun LazyListScope.outgoingFormItems( 
            label = stringResource(id = R.string.account_server_settings_server_label),

            isRequired = true,

            contentPadding = defaultItemPadding(),

            keyboardOptions = KeyboardOptions(autoCorrect = false),

        )

    }
@@ -87,6 +89,7 @@ internal fun LazyListScope.outgoingFormItems( 
                label = stringResource(id = R.string.account_server_settings_username_label),

                isRequired = true,

                contentPadding = defaultItemPadding(),

                keyboardOptions = KeyboardOptions(autoCorrect = false),

            )

        }

    }