Fix modifier issue.

This commit is contained in:
Benoit Marty 2023-06-30 21:43:44 +02:00 committed by Benoit Marty
parent bf26aa13c8
commit 7f79cba40d
2 changed files with 16 additions and 2 deletions

View file

@ -47,13 +47,13 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Composable @Composable
fun PreferencesRootView( fun PreferencesRootView(
state: PreferencesRootState, state: PreferencesRootState,
modifier: Modifier = Modifier,
onBackPressed: () -> Unit, onBackPressed: () -> Unit,
onVerifyClicked: () -> Unit, onVerifyClicked: () -> Unit,
onOpenAnalytics: () -> Unit, onOpenAnalytics: () -> Unit,
onOpenRageShake: () -> Unit, onOpenRageShake: () -> Unit,
onOpenAbout: () -> Unit, onOpenAbout: () -> Unit,
onOpenDeveloperSettings: () -> Unit, onOpenDeveloperSettings: () -> Unit,
modifier: Modifier = Modifier,
) { ) {
// Include pref from other modules // Include pref from other modules
PreferenceView( PreferenceView(

View file

@ -46,8 +46,22 @@ fun MatrixUserHeader(
// onClick: () -> Unit = {}, // onClick: () -> Unit = {},
) { ) {
if (matrixUser == null) { if (matrixUser == null) {
return MatrixUserHeaderPlaceholder(modifier = modifier) MatrixUserHeaderPlaceholder(modifier = modifier)
} else {
MatrixUserHeaderContent(
matrixUser = matrixUser,
modifier = modifier,
// onClick = onClick
)
} }
}
@Composable
private fun MatrixUserHeaderContent(
matrixUser: MatrixUser,
modifier: Modifier = Modifier,
// onClick: () -> Unit = {},
) {
Row( Row(
modifier = modifier modifier = modifier
// .clickable(onClick = onClick) // .clickable(onClick = onClick)