Merge pull request #7120 from thundernest/oauth_hide_next_button (717cdfff) · Commits · e / os / Mail

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ interface AccountAutoDiscoveryContract {
		val isSuccess: Boolean = false,
		val error: Error? = null,
		val isLoading: Boolean = false,

		val isNextButtonVisible: Boolean = true,
		)

		sealed interface Event {

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ import app.k9mail.core.ui.compose.theme.K9Theme
		import app.k9mail.core.ui.compose.theme.ThunderbirdTheme
		import app.k9mail.feature.account.common.ui.AppTitleTopHeader
		import app.k9mail.feature.account.common.ui.WizardNavigationBar
		import app.k9mail.feature.account.common.ui.WizardNavigationBarState
		import app.k9mail.feature.account.oauth.ui.preview.PreviewAccountOAuthViewModel
		import app.k9mail.feature.account.setup.R
		import app.k9mail.feature.account.setup.ui.autodiscovery.AccountAutoDiscoveryContract.Effect
		@@ -49,6 +50,7 @@ internal fun AccountAutoDiscoveryScreen(
		backButtonText = stringResource(id = R.string.account_setup_button_back),
		onNextClick = { dispatch(Event.OnNextClicked) },
		onBackClick = { dispatch(Event.OnBackClicked) },
		state = WizardNavigationBarState(showNext = state.value.isNextButtonVisible),
		)
		},
		modifier = modifier,

+4 −3

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ internal class AccountAutoDiscoveryViewModel(
		updateState {
		State(
		emailAddress = StringInputField(value = emailAddress),
		isNextButtonVisible = true,
		)
		}
		}
		@@ -90,7 +91,7 @@ internal class AccountAutoDiscoveryViewModel(
		}

		ConfigStep.PASSWORD -> submitPassword()
		ConfigStep.OAUTH -> TODO()
		ConfigStep.OAUTH -> Unit
		}
		}

		@@ -159,13 +160,12 @@ internal class AccountAutoDiscoveryViewModel(
		)
		}

		// TODO: disable next button if isOAuth = true

		updateState {
		it.copy(
		isLoading = false,
		autoDiscoverySettings = settings,
		configStep = if (isOAuth) ConfigStep.OAUTH else ConfigStep.PASSWORD,
		isNextButtonVisible = !isOAuth,
		)
		}
		}
		@@ -227,6 +227,7 @@ internal class AccountAutoDiscoveryViewModel(
		it.copy(
		configStep = ConfigStep.EMAIL_ADDRESS,
		password = StringInputField(),
		isNextButtonVisible = true,
		)
		}
		}