Move content @Composable to the end of the parameter list.

A @Composable `content` parameter should be moved to be the trailing lambda in a composable function.
This commit is contained in:
Benoit Marty
2024-05-29 12:38:14 +02:00
parent c92e6eb2e3
commit 919849acc2
5 changed files with 25 additions and 22 deletions

View File

@@ -64,7 +64,6 @@ fun LogoutView(
subTitle = subtitle(state),
iconVector = CompoundIcons.KeySolid(),
modifier = modifier,
content = { Content(state) },
buttons = {
Buttons(
state = state,
@@ -74,7 +73,9 @@ fun LogoutView(
}
)
},
)
) {
Content(state)
}
LogoutActionDialog(
state.logoutAction,

View File

@@ -53,9 +53,10 @@ fun SecureBackupDisableView(
title = stringResource(id = R.string.screen_key_backup_disable_title),
subTitle = stringResource(id = R.string.screen_key_backup_disable_description),
iconVector = CompoundIcons.KeyOffSolid(),
content = { Content(state = state) },
buttons = { Buttons(state = state) },
)
) {
Content(state = state)
}
AsyncActionView(
async = state.disableAction,

View File

@@ -58,9 +58,10 @@ fun SecureBackupEnterRecoveryKeyView(
iconVector = CompoundIcons.KeySolid(),
title = stringResource(id = R.string.screen_recovery_key_confirm_title),
subTitle = stringResource(id = R.string.screen_recovery_key_confirm_description),
content = { Content(state = state) },
buttons = { Buttons(state = state, onCreateRecoveryKey = onCreateNewRecoveryKey) }
)
) {
Content(state = state)
}
}
@Composable

View File

@@ -52,9 +52,10 @@ fun SecureBackupSetupView(
title = title(state),
subTitle = subtitle(state),
iconVector = CompoundIcons.KeySolid(),
content = { Content(state) },
buttons = { Buttons(state, onFinish = onSuccess) },
)
) {
Content(state = state)
}
if (state.showSaveConfirmationDialog) {
ConfirmationDialog(

View File

@@ -54,8 +54,8 @@ fun FlowStepPage(
modifier: Modifier = Modifier,
onBackClick: (() -> Unit)? = null,
subTitle: String? = null,
content: @Composable () -> Unit = {},
buttons: @Composable ColumnScope.() -> Unit = {},
content: @Composable () -> Unit = {},
) {
BackHandler(enabled = onBackClick != null) {
onBackClick?.invoke()
@@ -98,21 +98,20 @@ internal fun FlowStepPagePreview() = ElementPreview {
title = "Title",
subTitle = "Subtitle",
iconVector = CompoundIcons.Computer(),
content = {
Box(
Modifier
.fillMaxSize(),
contentAlignment = Alignment.Center
) {
Text(
text = "Content",
style = ElementTheme.typography.fontHeadingXlBold
)
}
},
buttons = {
TextButton(text = "A button", onClick = { })
Button(text = "Continue", onClick = { })
}
)
) {
Box(
Modifier
.fillMaxSize(),
contentAlignment = Alignment.Center
) {
Text(
text = "Content",
style = ElementTheme.typography.fontHeadingXlBold
)
}
}
}