Browse Source

Ensure room name have horizontal padding and is centered if displayed on several lines, and remove unnecessary Box around the Avatar.

pull/986/head
Benoit Marty 1 year ago
parent
commit
6a77974af4
  1. 26
      features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt

26
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt

@ -17,13 +17,11 @@
package io.element.android.features.roomdetails.impl package io.element.android.features.roomdetails.impl
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -226,22 +224,28 @@ internal fun RoomHeaderSection(
roomAlias: String?, roomAlias: String?,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
Column(modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { Column(
Box(modifier = Modifier.size(70.dp)) { modifier = modifier
Avatar( .fillMaxWidth()
avatarData = AvatarData(roomId, roomName, avatarUrl, AvatarSize.RoomHeader), .padding(horizontal = 16.dp),
modifier = Modifier.fillMaxSize() horizontalAlignment = Alignment.CenterHorizontally,
) ) {
} Avatar(
avatarData = AvatarData(roomId, roomName, avatarUrl, AvatarSize.RoomHeader),
modifier = Modifier.size(70.dp)
)
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(24.dp))
Text(roomName, style = ElementTheme.typography.fontHeadingLgBold) Text(
text = roomName,
style = ElementTheme.typography.fontHeadingLgBold,
textAlign = TextAlign.Center,
)
if (roomAlias != null) { if (roomAlias != null) {
Spacer(modifier = Modifier.height(6.dp)) Spacer(modifier = Modifier.height(6.dp))
Text( Text(
text = roomAlias, text = roomAlias,
style = ElementTheme.typography.fontBodyLgRegular, style = ElementTheme.typography.fontBodyLgRegular,
color = MaterialTheme.colorScheme.secondary, color = MaterialTheme.colorScheme.secondary,
modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
) )
} }

Loading…
Cancel
Save