mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:55:41 +00:00
Fix modifier issue.
This commit is contained in:
committed by
Benoit Marty
parent
b69de38c66
commit
0ea811269b
+1
-1
@@ -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(
|
||||||
|
|||||||
+15
-1
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user