Hide 'import settings' button in welcome screen (Thunderbird) (10f36e15) · Commits · e / os / Mail

feature/onboarding/main/src/main/kotlin/app/k9mail/feature/onboarding/main/navigation/OnboardingNavHost.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ fun OnboardingNavHost(
		},
		onImportClick = { navController.navigateToSettingsImport() },
		appNameProvider = koinInject(),
		onboardingMigrationManager = koinInject(),
		)
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,4 +10,5 @@ android {
		dependencies {
		implementation(projects.core.common)
		implementation(projects.core.ui.compose.designsystem)
		implementation(projects.feature.onboarding.migration.api)
		}

+9 −6

Original line number	Diff line number	Diff line
		@@ -2,28 +2,31 @@ package app.k9mail.feature.onboarding.welcome.ui

		import androidx.compose.runtime.Composable
		import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
		import app.k9mail.core.ui.compose.designsystem.PreviewThemeType
		import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme

		@Composable
		@PreviewDevices
		internal fun WelcomeContentPreview() {
		PreviewWithTheme {
		internal fun WelcomeContentThunderbirdPreview() {
		PreviewWithTheme(themeType = PreviewThemeType.THUNDERBIRD) {
		WelcomeContent(
		onStartClick = {},
		onImportClick = {},
		appName = "AppName",
		appName = "Thunderbird Beta",
		showImportButton = false,
		)
		}
		}

		@Composable
		@PreviewDevices
		internal fun WelcomeContentWithLongTitlePreview() {
		PreviewWithTheme {
		internal fun WelcomeContentK9MailPreview() {
		PreviewWithTheme(themeType = PreviewThemeType.K9MAIL) {
		WelcomeContent(
		onStartClick = {},
		onImportClick = {},
		appName = "Thunderbird Debug",
		appName = "K-9 Mail",
		showImportButton = true,
		)
		}
		}

+11 −6

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ internal fun WelcomeContent(
		onStartClick: () -> Unit,
		onImportClick: () -> Unit,
		appName: String,
		showImportButton: Boolean,
		modifier: Modifier = Modifier,
		) {
		Surface(
		@@ -49,11 +50,12 @@ internal fun WelcomeContent(
		modifier = Modifier.fillMaxSize(),
		footer = {
		WelcomeFooter(
		showImportButton = showImportButton,
		onStartClick = onStartClick,
		onImportClick = onImportClick,
		modifier = Modifier
		.fillMaxWidth()
		.padding(top = MainTheme.spacings.quadruple),
		onStartClick = onStartClick,
		onImportClick = onImportClick,
		)
		},
		verticalArrangement = Arrangement.SpaceEvenly,
		@@ -142,6 +144,7 @@ private fun WelcomeMessage(

		@Composable
		private fun WelcomeFooter(
		showImportButton: Boolean,
		onStartClick: () -> Unit,
		onImportClick: () -> Unit,
		modifier: Modifier = Modifier,
		@@ -155,12 +158,14 @@ private fun WelcomeFooter(
		text = stringResource(id = R.string.onboarding_welcome_start_button),
		onClick = onStartClick,
		)
		if (showImportButton) {
		ButtonText(
		text = stringResource(id = R.string.onboarding_welcome_import_button),
		onClick = onImportClick,
		)
		}
		}
		}

		private fun Modifier.defaultItemModifier() = composed {
		fillMaxWidth()

+3 −0

Original line number	Diff line number	Diff line
		@@ -2,16 +2,19 @@ package app.k9mail.feature.onboarding.welcome.ui

		import androidx.compose.runtime.Composable
		import app.k9mail.core.common.provider.AppNameProvider
		import app.k9mail.feature.onboarding.migration.api.OnboardingMigrationManager

		@Composable
		fun WelcomeScreen(
		onStartClick: () -> Unit,
		onImportClick: () -> Unit,
		appNameProvider: AppNameProvider,
		onboardingMigrationManager: OnboardingMigrationManager,
		) {
		WelcomeContent(
		onStartClick = onStartClick,
		onImportClick = onImportClick,
		appName = appNameProvider.appName,
		showImportButton = !onboardingMigrationManager.isFeatureIncluded(),
		)
		}