From 31e14aa59d882a2e9e16b2dbe97b5fa20ad94cbb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 6 Sep 2023 15:25:08 +0200
Subject: [PATCH] Make links in room topic clickable (#612)

---
 changelog.d/612.bugfix                               |  1 +
 .../features/roomdetails/impl/RoomDetailsView.kt     | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/612.bugfix

diff --git a/changelog.d/612.bugfix b/changelog.d/612.bugfix
new file mode 100644
index 0000000000..390329afa1
--- /dev/null
+++ b/changelog.d/612.bugfix
@@ -0,0 +1 @@
+Make links in room topic clickable
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 51754ca6de..735ed8491a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.features.roomdetails.impl
 
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
@@ -55,6 +56,7 @@ import io.element.android.features.roomdetails.impl.blockuser.BlockUserDialogs
 import io.element.android.features.roomdetails.impl.blockuser.BlockUserSection
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberHeaderSection
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberMainActionsSection
+import io.element.android.libraries.designsystem.components.ClickableLinkText
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -266,11 +268,13 @@ internal fun TopicSection(
                 onClick = { onActionClicked(RoomDetailsAction.AddTopic) },
             )
         } else if (roomTopic is RoomTopicState.ExistingTopic) {
-            Text(
-                roomTopic.topic,
+            ClickableLinkText(
+                text = roomTopic.topic,
                 modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 12.dp),
-                style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.tertiary
+                interactionSource = remember { MutableInteractionSource() },
+                style = MaterialTheme.typography.bodyMedium.copy(
+                    color = MaterialTheme.colorScheme.tertiary,
+                ),
             )
         }
     }