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

Unverified Commit 4bc2afa9 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #6984 from thundernest/rename_account_setup_autoconfig_to_autodiscovery 

Rename account setup autoconfig to autodiscovery
parents 15dc5e68 df604d99

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/AccountSetupModule.kt

+5 −5
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ import app.k9mail.autodiscovery.service.RealAutoDiscoveryService 
import app.k9mail.feature.account.setup.domain.DomainContract

import app.k9mail.feature.account.setup.domain.usecase.GetAutoDiscovery

import app.k9mail.feature.account.setup.ui.AccountSetupViewModel

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigContract

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigValidator

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigViewModel

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryValidator

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryViewModel

import app.k9mail.feature.account.setup.ui.incoming.AccountIncomingConfigContract

import app.k9mail.feature.account.setup.ui.incoming.AccountIncomingConfigValidator

import app.k9mail.feature.account.setup.ui.incoming.AccountIncomingConfigViewModel
@@ -34,14 +34,14 @@ val featureAccountSetupModule: Module = module { 
        )

    }



    factory<AccountAutoConfigContract.Validator> { AccountAutoConfigValidator() }

    factory<AccountAutoDiscoveryContract.Validator> { AccountAutoDiscoveryValidator() }

    factory<AccountIncomingConfigContract.Validator> { AccountIncomingConfigValidator() }

    factory<AccountOutgoingConfigContract.Validator> { AccountOutgoingConfigValidator() }

    factory<AccountOptionsContract.Validator> { AccountOptionsValidator() }



    viewModel { AccountSetupViewModel() }

    viewModel {

        AccountAutoConfigViewModel(

        AccountAutoDiscoveryViewModel(

            validator = get(),

            getAutoDiscovery = get(),

        )

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/AccountSetupScreen.kt

+6 −6
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ import app.k9mail.feature.account.setup.ui.AccountSetupContract.Effect 
import app.k9mail.feature.account.setup.ui.AccountSetupContract.Event

import app.k9mail.feature.account.setup.ui.AccountSetupContract.SetupStep

import app.k9mail.feature.account.setup.ui.AccountSetupContract.ViewModel

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigContract

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigScreen

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigViewModel

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryScreen

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryViewModel

import app.k9mail.feature.account.setup.ui.incoming.AccountIncomingConfigContract

import app.k9mail.feature.account.setup.ui.incoming.AccountIncomingConfigScreen

import app.k9mail.feature.account.setup.ui.incoming.AccountIncomingConfigViewModel
@@ -26,7 +26,7 @@ fun AccountSetupScreen( 
    onFinish: () -> Unit,

    onBack: () -> Unit,

    viewModel: ViewModel = koinViewModel<AccountSetupViewModel>(),

    autoConfigViewModel: AccountAutoConfigContract.ViewModel = koinViewModel<AccountAutoConfigViewModel>(),

    autoDiscoveryViewModel: AccountAutoDiscoveryContract.ViewModel = koinViewModel<AccountAutoDiscoveryViewModel>(),

    incomingViewModel: AccountIncomingConfigContract.ViewModel = koinViewModel<AccountIncomingConfigViewModel>(),

    outgoingViewModel: AccountOutgoingConfigContract.ViewModel = koinViewModel<AccountOutgoingConfigViewModel>(),

    optionsViewModel: AccountOptionsContract.ViewModel = koinViewModel<AccountOptionsViewModel>(),
@@ -40,10 +40,10 @@ fun AccountSetupScreen( 


    when (state.value.setupStep) {

        SetupStep.AUTO_CONFIG -> {

            AccountAutoConfigScreen(

            AccountAutoDiscoveryScreen(

                onNext = { dispatch(Event.OnNext) },

                onBack = { dispatch(Event.OnBack) },

                viewModel = autoConfigViewModel,

                viewModel = autoDiscoveryViewModel,

            )

        }

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/AccountAutoConfigContent.kt→feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/AccountAutoDiscoveryContent.kt

+10 −10
Original line number Diff line number Diff line 
package app.k9mail.feature.account.setup.ui.autoconfig

package app.k9mail.feature.account.setup.ui.autodiscovery



import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.PaddingValues
@@ -19,14 +19,14 @@ import app.k9mail.core.ui.compose.theme.K9Theme 
import app.k9mail.core.ui.compose.theme.MainTheme

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

import app.k9mail.feature.account.setup.R

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigContract.Event

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigContract.State

import app.k9mail.feature.account.setup.ui.autoconfig.item.contentItems

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract.Event

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract.State

import app.k9mail.feature.account.setup.ui.autodiscovery.item.contentItems

import app.k9mail.feature.account.setup.ui.common.item.ErrorItem

import app.k9mail.feature.account.setup.ui.common.item.LoadingItem



@Composable

internal fun AccountAutoConfigContent(

internal fun AccountAutoDiscoveryContent(

    state: State,

    onEvent: (Event) -> Unit,

    contentPadding: PaddingValues,
@@ -34,7 +34,7 @@ internal fun AccountAutoConfigContent( 
) {

    ResponsiveWidthContainer(

        modifier = Modifier

            .testTag("AccountAutoConfigContent")

            .testTag("AccountAutoDiscoveryContent")

            .padding(contentPadding)

            .fillMaxWidth()

            .then(modifier),
@@ -73,9 +73,9 @@ internal fun AccountAutoConfigContent( 


@Composable

@DevicePreviews

internal fun AccountAutoConfigContentK9Preview() {

internal fun AccountAutoDiscoveryContentK9Preview() {

    K9Theme {

        AccountAutoConfigContent(

        AccountAutoDiscoveryContent(

            state = State(),

            onEvent = {},

            contentPadding = PaddingValues(),
@@ -85,9 +85,9 @@ internal fun AccountAutoConfigContentK9Preview() { 


@Composable

@DevicePreviews

internal fun AccountAutoConfigContentThunderbirdPreview() {

internal fun AccountAutoDiscoveryContentThunderbirdPreview() {

    ThunderbirdTheme {

        AccountAutoConfigContent(

        AccountAutoDiscoveryContent(

            state = State(),

            onEvent = {},

            contentPadding = PaddingValues(),

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/AccountAutoConfigContract.kt→feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/AccountAutoDiscoveryContract.kt

+2 −2
Original line number Diff line number Diff line 
package app.k9mail.feature.account.setup.ui.autoconfig

package app.k9mail.feature.account.setup.ui.autodiscovery



import app.k9mail.autodiscovery.api.AutoDiscoveryResult

import app.k9mail.core.common.domain.usecase.validation.ValidationResult
@@ -6,7 +6,7 @@ import app.k9mail.core.ui.compose.common.mvi.UnidirectionalViewModel 
import app.k9mail.feature.account.setup.domain.input.BooleanInputField

import app.k9mail.feature.account.setup.domain.input.StringInputField



interface AccountAutoConfigContract {

interface AccountAutoDiscoveryContract {



    enum class ConfigStep {

        EMAIL_ADDRESS,

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/AccountAutoConfigScreen.kt→feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autodiscovery/AccountAutoDiscoveryScreen.kt

+14 −14
Original line number Diff line number Diff line 
package app.k9mail.feature.account.setup.ui.autoconfig

package app.k9mail.feature.account.setup.ui.autodiscovery



import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier
@@ -10,14 +10,14 @@ import app.k9mail.core.ui.compose.designsystem.template.Scaffold 
import app.k9mail.core.ui.compose.theme.K9Theme

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

import app.k9mail.feature.account.setup.R

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigContract.Effect

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigContract.Event

import app.k9mail.feature.account.setup.ui.autoconfig.AccountAutoConfigContract.ViewModel

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract.Effect

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract.Event

import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract.ViewModel

import app.k9mail.feature.account.setup.ui.common.AccountSetupBottomBar

import app.k9mail.feature.account.setup.ui.common.AccountSetupTopHeader



@Composable

internal fun AccountAutoConfigScreen(

internal fun AccountAutoDiscoveryScreen(

    onNext: () -> Unit,

    onBack: () -> Unit,

    viewModel: ViewModel,
@@ -44,7 +44,7 @@ internal fun AccountAutoConfigScreen( 
        },

        modifier = modifier,

    ) { innerPadding ->

        AccountAutoConfigContent(

        AccountAutoDiscoveryContent(

            state = state.value,

            onEvent = { dispatch(it) },

            contentPadding = innerPadding,
@@ -54,13 +54,13 @@ internal fun AccountAutoConfigScreen( 


@Composable

@DevicePreviews

internal fun AccountAutoConfigScreenK9Preview() {

internal fun AccountAutoDiscoveryScreenK9Preview() {

    K9Theme {

        AccountAutoConfigScreen(

        AccountAutoDiscoveryScreen(

            onNext = {},

            onBack = {},

            viewModel = AccountAutoConfigViewModel(

                validator = AccountAutoConfigValidator(),

            viewModel = AccountAutoDiscoveryViewModel(

                validator = AccountAutoDiscoveryValidator(),

                getAutoDiscovery = { AutoDiscoveryResult.NoUsableSettingsFound },

            ),

        )
@@ -69,13 +69,13 @@ internal fun AccountAutoConfigScreenK9Preview() { 


@Composable

@DevicePreviews

internal fun AccountAutoConfigScreenThunderbirdPreview() {

internal fun AccountAutoDiscoveryScreenThunderbirdPreview() {

    ThunderbirdTheme {

        AccountAutoConfigScreen(

        AccountAutoDiscoveryScreen(

            onNext = {},

            onBack = {},

            viewModel = AccountAutoConfigViewModel(

                validator = AccountAutoConfigValidator(),

            viewModel = AccountAutoDiscoveryViewModel(

                validator = AccountAutoDiscoveryValidator(),

                getAutoDiscovery = { AutoDiscoveryResult.NoUsableSettingsFound },

            ),

        )