Rename AccountOutgoingConfig to OutgoingServerSettings (e152c1f2) · Commits · e / os / Mail

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ServerConfigModule.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -3,16 +3,16 @@ package app.k9mail.feature.account.server.settings
		import app.k9mail.feature.account.server.settings.ui.incoming.IncomingServerSettingsContract
		import app.k9mail.feature.account.server.settings.ui.incoming.IncomingServerSettingsValidator
		import app.k9mail.feature.account.server.settings.ui.incoming.IncomingServerSettingsViewModel
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigContract
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigValidator
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigViewModel
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsContract
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsValidator
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsViewModel
		import org.koin.androidx.viewmodel.dsl.viewModel
		import org.koin.core.module.Module
		import org.koin.dsl.module

		val featureAccountServerConfigModule: Module = module {
		factory<IncomingServerSettingsContract.Validator> { IncomingServerSettingsValidator() }
		factory<AccountOutgoingConfigContract.Validator> { AccountOutgoingConfigValidator() }
		factory<OutgoingServerSettingsContract.Validator> { OutgoingServerSettingsValidator() }

		viewModel {
		IncomingServerSettingsViewModel(
		@@ -22,7 +22,7 @@ val featureAccountServerConfigModule: Module = module {
		}

		viewModel {
		AccountOutgoingConfigViewModel(
		OutgoingServerSettingsViewModel(
		validator = get(),
		accountStateRepository = get(),
		)

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/AccountOutgoingConfigContent.kt→feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContent.kt

+8 −8

Original line number	Diff line number	Diff line
		@@ -30,12 +30,12 @@ import app.k9mail.feature.account.common.ui.item.defaultItemPadding
		import app.k9mail.feature.account.server.settings.R
		import app.k9mail.feature.account.server.settings.ui.common.ClientCertificateInput
		import app.k9mail.feature.account.server.settings.ui.common.mapper.toResourceString
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigContract.Event
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigContract.State
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsContract.Event
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsContract.State

		@Suppress("LongMethod")
		@Composable
		internal fun AccountOutgoingConfigContent(
		internal fun OutgoingServerSettingsContent(
		state: State,
		onEvent: (Event) -> Unit,
		contentPadding: PaddingValues,
		@@ -45,7 +45,7 @@ internal fun AccountOutgoingConfigContent(

		ResponsiveWidthContainer(
		modifier = Modifier
		.testTag("AccountOutgoingConfigContent")
		.testTag("OutgoingServerSettingsContent")
		.padding(contentPadding)
		.fillMaxWidth()
		.then(modifier),
		@@ -144,9 +144,9 @@ internal fun AccountOutgoingConfigContent(

		@Composable
		@DevicePreviews
		internal fun AccountOutgoingConfigContentK9Preview() {
		internal fun OutgoingServerSettingsContentK9Preview() {
		K9Theme {
		AccountOutgoingConfigContent(
		OutgoingServerSettingsContent(
		onEvent = { },
		state = State(),
		contentPadding = PaddingValues(),
		@@ -156,9 +156,9 @@ internal fun AccountOutgoingConfigContentK9Preview() {

		@Composable
		@DevicePreviews
		internal fun AccountOutgoingConfigContentThunderbirdPreview() {
		internal fun OutgoingServerSettingsContentThunderbirdPreview() {
		ThunderbirdTheme {
		AccountOutgoingConfigContent(
		OutgoingServerSettingsContent(
		onEvent = { },
		state = State(),
		contentPadding = PaddingValues(),

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/AccountOutgoingConfigContract.kt→feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsContract.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ import app.k9mail.feature.account.common.domain.entity.toSmtpDefaultPort
		import app.k9mail.feature.account.common.domain.input.NumberInputField
		import app.k9mail.feature.account.common.domain.input.StringInputField

		interface AccountOutgoingConfigContract {
		interface OutgoingServerSettingsContract {

		interface ViewModel : UnidirectionalViewModel<State, Event, Effect>

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/AccountOutgoingConfigScreen.kt→feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsScreen.kt

+13 −13

Original line number	Diff line number	Diff line
		@@ -14,12 +14,12 @@ import app.k9mail.feature.account.common.ui.AccountTopAppBar
		import app.k9mail.feature.account.common.ui.WizardNavigationBar
		import app.k9mail.feature.account.common.ui.preview.PreviewAccountStateRepository
		import app.k9mail.feature.account.server.settings.R
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigContract.Effect
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigContract.Event
		import app.k9mail.feature.account.server.settings.ui.outgoing.AccountOutgoingConfigContract.ViewModel
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsContract.Effect
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsContract.Event
		import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsContract.ViewModel

		@Composable
		fun AccountOutgoingConfigScreen(
		fun OutgoingServerSettingsScreen(
		onNext: () -> Unit,
		onBack: () -> Unit,
		viewModel: ViewModel,
		@@ -54,7 +54,7 @@ fun AccountOutgoingConfigScreen(
		},
		modifier = modifier,
		) { innerPadding ->
		AccountOutgoingConfigContent(
		OutgoingServerSettingsContent(
		state = state.value,
		onEvent = { dispatch(it) },
		contentPadding = innerPadding,
		@@ -64,13 +64,13 @@ fun AccountOutgoingConfigScreen(

		@Composable
		@DevicePreviews
		internal fun AccountOutgoingConfigScreenK9Preview() {
		internal fun OutgoingServerSettingsScreenK9Preview() {
		K9Theme {
		AccountOutgoingConfigScreen(
		OutgoingServerSettingsScreen(
		onNext = {},
		onBack = {},
		viewModel = AccountOutgoingConfigViewModel(
		validator = AccountOutgoingConfigValidator(),
		viewModel = OutgoingServerSettingsViewModel(
		validator = OutgoingServerSettingsValidator(),
		accountStateRepository = PreviewAccountStateRepository(),
		),
		)
		@@ -79,13 +79,13 @@ internal fun AccountOutgoingConfigScreenK9Preview() {

		@Composable
		@DevicePreviews
		internal fun AccountOutgoingConfigScreenThunderbirdPreview() {
		internal fun OutgoingServerSettingsScreenThunderbirdPreview() {
		ThunderbirdTheme {
		AccountOutgoingConfigScreen(
		OutgoingServerSettingsScreen(
		onNext = {},
		onBack = {},
		viewModel = AccountOutgoingConfigViewModel(
		validator = AccountOutgoingConfigValidator(),
		viewModel = OutgoingServerSettingsViewModel(
		validator = OutgoingServerSettingsValidator(),
		accountStateRepository = PreviewAccountStateRepository(),
		),
		)

feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/AccountOutgoingConfigStateExtensions.kt→feature/account/server/settings/src/main/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/OutgoingServerSettingsStateExtensions.kt

+2 −2

Original line number	Diff line number	Diff line
		package app.k9mail.feature.account.server.settings.ui.outgoing

		internal val AccountOutgoingConfigContract.State.isUsernameFieldVisible: Boolean
		internal val OutgoingServerSettingsContract.State.isUsernameFieldVisible: Boolean
		get() = authenticationType.isUsernameRequired

		internal val AccountOutgoingConfigContract.State.isPasswordFieldVisible: Boolean
		internal val OutgoingServerSettingsContract.State.isPasswordFieldVisible: Boolean
		get() = authenticationType.isPasswordRequired