Skip to content

Commit 489c1f4

Browse files
authored
Merge pull request #3064 from element-hq/feature/bma/avatarClick
Improve click behavior on room timeline title
2 parents d9d5a06 + 3023329 commit 489c1f4

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
3333
import androidx.compose.foundation.layout.padding
3434
import androidx.compose.foundation.layout.statusBars
3535
import androidx.compose.foundation.layout.width
36+
import androidx.compose.foundation.shape.RoundedCornerShape
3637
import androidx.compose.material3.ExperimentalMaterial3Api
3738
import androidx.compose.material3.MaterialTheme
3839
import androidx.compose.runtime.Composable
@@ -43,6 +44,7 @@ import androidx.compose.runtime.remember
4344
import androidx.compose.runtime.rememberUpdatedState
4445
import androidx.compose.ui.Alignment
4546
import androidx.compose.ui.Modifier
47+
import androidx.compose.ui.draw.clip
4648
import androidx.compose.ui.geometry.Offset
4749
import androidx.compose.ui.graphics.RectangleShape
4850
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
@@ -454,7 +456,10 @@ private fun MessagesViewTopBar(
454456
BackButton(onClick = onBackClick)
455457
},
456458
title = {
457-
val titleModifier = Modifier.clickable { onRoomDetailsClick() }
459+
val roundedCornerShape = RoundedCornerShape(8.dp)
460+
val titleModifier = Modifier
461+
.clip(roundedCornerShape)
462+
.clickable { onRoomDetailsClick() }
458463
if (roomName != null && roomAvatar != null) {
459464
RoomAvatarAndNameRow(
460465
roomName = roomName,
@@ -514,8 +519,8 @@ private fun RoomAvatarAndNameRow(
514519
avatarData = roomAvatar,
515520
heroes = heroes,
516521
)
517-
Spacer(modifier = Modifier.width(8.dp))
518522
Text(
523+
modifier = Modifier.padding(horizontal = 8.dp),
519524
text = roomName,
520525
style = ElementTheme.typography.fontBodyLgMedium,
521526
maxLines = 1,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ fun IconTitlePlaceholdersRowMolecule(
5858
PlaceholderAtom(width = 20.dp, height = 7.dp)
5959
Spacer(modifier = Modifier.width(7.dp))
6060
PlaceholderAtom(width = 45.dp, height = 7.dp)
61+
Spacer(modifier = Modifier.width(8.dp))
6162
}
6263
}
6364

Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)