Browse Source

Fix modifier issue.

julioromano/fixTallAndWidePreviews
Benoit Marty 1 year ago committed by Benoit Marty
parent
commit
0ea811269b
  1. 2
      features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
  2. 16
      libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt

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

16
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt

@ -46,8 +46,22 @@ fun MatrixUserHeader( @@ -46,8 +46,22 @@ fun MatrixUserHeader(
// onClick: () -> Unit = {},
) {
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(
modifier = modifier
// .clickable(onClick = onClick)

Loading…
Cancel
Save