Merge pull request #8366 from cketti/update_welcome_screen (9785781d) · Commits · e / os / Mail

feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt

+10 −3

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import app.k9mail.core.ui.compose.designsystem.atom.Surface
		import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonFilled
		import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonText
		import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodyLarge
		import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodySmall
		import app.k9mail.core.ui.compose.designsystem.atom.text.TextDisplayMedium
		import app.k9mail.core.ui.compose.designsystem.template.LazyColumnWithHeaderFooter
		import app.k9mail.core.ui.compose.designsystem.template.ResponsiveContent
		@@ -76,7 +77,6 @@ internal fun WelcomeContent(
		item {
		WelcomeMessage(
		modifier = Modifier.defaultItemModifier(),
		appName = appName,
		)
		}
		}
		@@ -127,7 +127,6 @@ private fun WelcomeTitle(

		@Composable
		private fun WelcomeMessage(
		appName: String,
		modifier: Modifier = Modifier,
		) {
		Column(
		@@ -137,7 +136,8 @@ private fun WelcomeMessage(
		horizontalAlignment = Alignment.CenterHorizontally,
		) {
		TextBodyLarge(
		text = stringResource(id = R.string.onboarding_welcome_message, appName),
		text = stringResource(id = R.string.onboarding_welcome_text),
		textAlign = TextAlign.Center,
		)
		}
		}
		@@ -164,6 +164,13 @@ private fun WelcomeFooter(
		onClick = onImportClick,
		)
		}

		TextBodySmall(
		text = stringResource(R.string.onboarding_welcome_developed_by),
		modifier = Modifier
		.padding(top = MainTheme.spacings.quadruple)
		.padding(horizontal = MainTheme.spacings.double),
		)
		}
		}

+4 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="onboarding_welcome_message">Welcome to <xliff:g id="app_name">%s</xliff:g>, the Android email client designed for enhanced security, easy customization, and seamless management of all your email accounts.</string>
		<string name="onboarding_welcome_start_button">Start</string>
		<string name="onboarding_welcome_text">An open source, privacy-focused and ad-free email app for Android.</string>
		<string name="onboarding_welcome_start_button">Get started</string>
		<string name="onboarding_welcome_import_button">Import settings</string>
		<!-- Small note at the bottom of the welcome screen. "MZLA Technologies" and "Mozilla" are company/brand names that shouldn't be translated. -->
		<string name="onboarding_welcome_developed_by">Developed by a dedicated team at MZLA Technologies and a global community of volunteers. Part of the Mozilla family.</string>
		</resources>