From ea62ed7c5a3b40aef23765929da9bf54fcbae857 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Jun 2024 10:22:43 +0200
Subject: [PATCH] Improve click behavior on room timeline title. #3063

---
 .../android/features/messages/impl/MessagesView.kt       | 9 +++++++--
 .../atomic/molecules/IconTitlePlaceholdersRowMolecule.kt | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index 2da1d64642..24439c0c75 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -33,6 +33,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -43,6 +44,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
@@ -454,7 +456,10 @@ private fun MessagesViewTopBar(
             BackButton(onClick = onBackClick)
         },
         title = {
-            val titleModifier = Modifier.clickable { onRoomDetailsClick() }
+            val roundedCornerShape = RoundedCornerShape(8.dp)
+            val titleModifier = Modifier
+                .clip(roundedCornerShape)
+                .clickable { onRoomDetailsClick() }
             if (roomName != null && roomAvatar != null) {
                 RoomAvatarAndNameRow(
                     roomName = roomName,
@@ -514,8 +519,8 @@ private fun RoomAvatarAndNameRow(
             avatarData = roomAvatar,
             heroes = heroes,
         )
-        Spacer(modifier = Modifier.width(8.dp))
         Text(
+            modifier = Modifier.padding(horizontal = 8.dp),
             text = roomName,
             style = ElementTheme.typography.fontBodyLgMedium,
             maxLines = 1,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt
index 7bb0e22771..eeeb8ed5d5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt
@@ -58,6 +58,7 @@ fun IconTitlePlaceholdersRowMolecule(
         PlaceholderAtom(width = 20.dp, height = 7.dp)
         Spacer(modifier = Modifier.width(7.dp))
         PlaceholderAtom(width = 45.dp, height = 7.dp)
+        Spacer(modifier = Modifier.width(8.dp))
     }
 }