chore(ui-flows): update maestro ui flows (b993ae6f) · Commits · e / os / Mail

feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/WizardNavigationBar.kt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,7 @@ import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonOutlined
	import app.k9mail.core.ui.compose.designsystem.template.ResponsiveWidthContainer		import app.k9mail.core.ui.compose.designsystem.template.ResponsiveWidthContainer
	import app.k9mail.core.ui.compose.theme2.MainTheme		import app.k9mail.core.ui.compose.theme2.MainTheme
	import app.k9mail.feature.account.common.R		import app.k9mail.feature.account.common.R
			import net.thunderbird.core.ui.compose.common.modifier.testTagAsResourceId

	@Composable		@Composable
	fun WizardNavigationBar(		fun WizardNavigationBar(
	@@ -43,6 +44,7 @@ fun WizardNavigationBar(
	text = backButtonText,		text = backButtonText,
	onClick = onBackClick,		onClick = onBackClick,
	enabled = state.isBackEnabled,		enabled = state.isBackEnabled,
			modifier = Modifier.testTagAsResourceId("account_setup_back_button"),
	)		)
	}		}
	if (state.showNext) {		if (state.showNext) {
	@@ -50,6 +52,7 @@ fun WizardNavigationBar(
	text = nextButtonText,		text = nextButtonText,
	onClick = onNextClick,		onClick = onNextClick,
	enabled = state.isNextEnabled,		enabled = state.isNextEnabled,
			modifier = Modifier.testTagAsResourceId("account_setup_next_button"),
	)		)
	}		}
	}		}

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -152,6 +152,7 @@ internal fun ContentView(
	errorMessage = state.emailAddress.error?.toAutoDiscoveryValidationErrorString(resources),		errorMessage = state.emailAddress.error?.toAutoDiscoveryValidationErrorString(resources),
	onEmailAddressChange = { onEvent(Event.EmailAddressChanged(it)) },		onEmailAddressChange = { onEvent(Event.EmailAddressChanged(it)) },
	contentPadding = PaddingValues(),		contentPadding = PaddingValues(),
			modifier = Modifier.testTagAsResourceId("account_setup_email_address_input"),
	)		)

	if (state.configStep == AccountAutoDiscoveryContract.ConfigStep.PASSWORD) {		if (state.configStep == AccountAutoDiscoveryContract.ConfigStep.PASSWORD) {
	@@ -161,6 +162,7 @@ internal fun ContentView(
	errorMessage = state.password.error?.toAutoDiscoveryValidationErrorString(resources),		errorMessage = state.password.error?.toAutoDiscoveryValidationErrorString(resources),
	onPasswordChange = { onEvent(Event.PasswordChanged(it)) },		onPasswordChange = { onEvent(Event.PasswordChanged(it)) },
	contentPadding = PaddingValues(),		contentPadding = PaddingValues(),
			modifier = Modifier.testTagAsResourceId("account_setup_password_input"),
	)		)
	} else if (state.configStep == AccountAutoDiscoveryContract.ConfigStep.OAUTH) {		} else if (state.configStep == AccountAutoDiscoveryContract.ConfigStep.OAUTH) {
	val isAutoDiscoverySettingsTrusted = state.autoDiscoverySettings?.isTrusted ?: false		val isAutoDiscoverySettingsTrusted = state.autoDiscoverySettings?.isTrusted ?: false

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/options/display/DisplayOptionsContent.kt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,7 @@ internal fun DisplayOptionsContent(
	onTextChange = { onEvent(Event.OnAccountNameChanged(it)) },		onTextChange = { onEvent(Event.OnAccountNameChanged(it)) },
	label = stringResource(id = R.string.account_setup_options_account_name_label),		label = stringResource(id = R.string.account_setup_options_account_name_label),
	contentPadding = defaultItemPadding(),		contentPadding = defaultItemPadding(),
			modifier = Modifier.testTagAsResourceId("account_setup_display_options_account_name_input"),
	)		)
	}		}

	@@ -85,6 +86,7 @@ internal fun DisplayOptionsContent(
	label = stringResource(id = R.string.account_setup_options_display_name_label),		label = stringResource(id = R.string.account_setup_options_display_name_label),
	contentPadding = defaultItemPadding(),		contentPadding = defaultItemPadding(),
	isRequired = true,		isRequired = true,
			modifier = Modifier.testTagAsResourceId("account_setup_display_options_display_name_input"),
	)		)
	}		}

	@@ -96,6 +98,7 @@ internal fun DisplayOptionsContent(
	label = stringResource(id = R.string.account_setup_options_email_signature_label),		label = stringResource(id = R.string.account_setup_options_email_signature_label),
	contentPadding = defaultItemPadding(),		contentPadding = defaultItemPadding(),
	isSingleLine = false,		isSingleLine = false,
			modifier = Modifier.testTagAsResourceId("account_setup_display_options_signature_input"),
	)		)
	}		}

feature/onboarding/migration/thunderbird/src/main/kotlin/app/k9mail/feature/onboarding/migration/thunderbird/TbOnboardingMigrationScreen.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@ internal fun TbOnboardingMigrationScreen(
	ButtonOutlined(		ButtonOutlined(
	text = stringResource(R.string.onboarding_migration_thunderbird_new_account_button_text),		text = stringResource(R.string.onboarding_migration_thunderbird_new_account_button_text),
	onClick = onAddAccount,		onClick = onAddAccount,
	modifier = Modifier.testTagAsResourceId("onboarding_migration_new_account_button",),		modifier = Modifier.testTagAsResourceId("onboarding_migration_new_account_button"),
	)		)
	}		}

feature/onboarding/migration/thunderbird/src/test/kotlin/app/k9mail/feature/onboarding/migration/thunderbird/TbOnboardingMigrationScreenKtTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,7 @@ class TbOnboardingMigrationScreenKtTest : ComposeTest() {
	)		)
	}		}

	composeTestRule.onNodeWithTag("AddAccountButton")		composeTestRule.onNodeWithTag("onboarding_migration_new_account_button")
	.performScrollTo()		.performScrollTo()
	.performClick()		.performClick()