Merge pull request #1237 from vector-im/feature/bma/linkInTopic

Feature/bma/link in topic
This commit is contained in:
Benoit Marty
2023-09-06 18:12:49 +02:00
committed by GitHub
16 changed files with 37 additions and 32 deletions

1
changelog.d/612.bugfix Normal file
View File

@@ -0,0 +1 @@
Make links in room topic clickable

View File

@@ -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,
),
)
}
}