Merge pull request #8352 from cketti/onboarding_migration (f33f713d) · Commits · e / os / Mail

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/card/CardFilled.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -8,11 +8,9 @@ import androidx.compose.material3.Card as Material3Card
		@Composable
		fun CardFilled(
		modifier: Modifier = Modifier,
		onClick: () -> Unit = {},
		content: @Composable ColumnScope.() -> Unit,
		) {
		Material3Card(
		onClick = onClick,
		modifier = modifier,
		content = content,
		)

+18 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.text.AnnotatedString
		import androidx.compose.ui.text.style.LineHeightStyle
		import androidx.compose.ui.text.style.TextAlign
		import app.k9mail.core.ui.compose.theme2.MainTheme
		import androidx.compose.material3.Text as Material3Text
		@@ -39,3 +40,20 @@ fun TextBodyMedium(
		style = MainTheme.typography.bodyMedium,
		)
		}

		@Composable
		fun TextBodyMedium(
		text: String,
		lineHeightStyle: LineHeightStyle,
		modifier: Modifier = Modifier,
		color: Color = Color.Unspecified,
		textAlign: TextAlign? = null,
		) {
		Material3Text(
		text = text,
		modifier = modifier,
		color = color,
		textAlign = textAlign,
		style = MainTheme.typography.bodyMedium.copy(lineHeightStyle = lineHeightStyle),
		)
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -88,8 +88,9 @@ fun OnboardingNavHost(

		composable(route = NESTED_NAVIGATION_ROUTE_MIGRATION) {
		onboardingMigrationManager.OnboardingMigrationScreen(
		onQrCodeScanClick = { navController.navigateToSettingsImportQrCode() },
		onAddAccountClick = { navController.navigateToAccountSetup() },
		onQrCodeScan = { navController.navigateToSettingsImportQrCode() },
		onAddAccount = { navController.navigateToAccountSetup() },
		onImport = { navController.navigateToSettingsImport() },
		)
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,8 @@ interface OnboardingMigrationManager {

		@Composable
		fun OnboardingMigrationScreen(
		onQrCodeScanClick: () -> Unit,
		onAddAccountClick: () -> Unit,
		onQrCodeScan: () -> Unit,
		onAddAccount: () -> Unit,
		onImport: () -> Unit,
		)
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,8 @@ class NoOpOnboardingMigrationManager : OnboardingMigrationManager {

		@Composable
		override fun OnboardingMigrationScreen(
		onQrCodeScanClick: () -> Unit,
		onAddAccountClick: () -> Unit,
		onQrCodeScan: () -> Unit,
		onAddAccount: () -> Unit,
		onImport: () -> Unit,
		) = Unit
		}