Skip to content

Commit a40c9ef

Browse files
authored
Merge pull request #1237 from vector-im/feature/bma/linkInTopic
Feature/bma/link in topic
2 parents 9e5b462 + 8504092 commit a40c9ef

16 files changed

+37
-32
lines changed

changelog.d/612.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Make links in room topic clickable

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package io.element.android.features.roomdetails.impl
1818

19+
import androidx.compose.foundation.interaction.MutableInteractionSource
1920
import androidx.compose.foundation.layout.Arrangement
2021
import androidx.compose.foundation.layout.Column
2122
import androidx.compose.foundation.layout.ExperimentalLayoutApi
@@ -55,6 +56,7 @@ import io.element.android.features.roomdetails.impl.blockuser.BlockUserDialogs
5556
import io.element.android.features.roomdetails.impl.blockuser.BlockUserSection
5657
import io.element.android.features.roomdetails.impl.members.details.RoomMemberHeaderSection
5758
import io.element.android.features.roomdetails.impl.members.details.RoomMemberMainActionsSection
59+
import io.element.android.libraries.designsystem.components.ClickableLinkText
5860
import io.element.android.libraries.designsystem.components.avatar.Avatar
5961
import io.element.android.libraries.designsystem.components.avatar.AvatarData
6062
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -266,11 +268,13 @@ internal fun TopicSection(
266268
onClick = { onActionClicked(RoomDetailsAction.AddTopic) },
267269
)
268270
} else if (roomTopic is RoomTopicState.ExistingTopic) {
269-
Text(
270-
roomTopic.topic,
271+
ClickableLinkText(
272+
text = roomTopic.topic,
271273
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 12.dp),
272-
style = MaterialTheme.typography.bodyMedium,
273-
color = MaterialTheme.colorScheme.tertiary
274+
interactionSource = remember { MutableInteractionSource() },
275+
style = MaterialTheme.typography.bodyMedium.copy(
276+
color = MaterialTheme.colorScheme.tertiary,
277+
),
274278
)
275279
}
276280
}
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)