diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/BlogPostView.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/BlogPostView.kt index f34aa343941fd007d471f7de7beda46f971886c5..75554b64df589551bf98a84c99ae094be60466b9 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/BlogPostView.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/BlogPostView.kt @@ -174,16 +174,11 @@ private fun BlogPostViewHeader( ) if (item is BlogCommentItem) { val postHeader = item.postHeader + // This isn't clickable, because item.type is WRAPPED_POST, so not easy to get the GroupId of the blog AuthorView( author = postHeader.author, authorInfo = postHeader.authorInfo, timestamp = postHeader.timestamp, - onAuthorClicked = if (onAuthorClicked == null) null else { - { onAuthorClicked(item.postHeader.groupId) } - }, - authorClickTooltip = if (onAuthorClicked == null) null else { - i18nF("blog.open.from.author", item.postHeader.author.name) - }, ) } } diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AuthorView.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AuthorView.kt index 71b2cd302a045ad19373ed7d533b1505fe037818..c395f0d79f1b6cc7fb1f2bac970b2877f25920cc 100644 --- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AuthorView.kt +++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/ui/AuthorView.kt @@ -18,8 +18,6 @@ package org.briarproject.briar.desktop.ui -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement.spacedBy import androidx.compose.foundation.layout.Row import androidx.compose.material.MaterialTheme @@ -38,9 +36,7 @@ import org.briarproject.briar.api.identity.AuthorInfo.Status.OURSELVES import org.briarproject.briar.desktop.contact.ProfileCircle import org.briarproject.briar.desktop.utils.TimeUtils import org.briarproject.briar.desktop.utils.UiUtils.getContactDisplayName -import org.briarproject.briar.desktop.utils.UiUtils.modifyIf -@OptIn(ExperimentalFoundationApi::class) @Composable fun AuthorView( author: Author, @@ -48,33 +44,26 @@ fun AuthorView( timestamp: Long, modifier: Modifier = Modifier, avatarSize: Dp = 27.dp, - onAuthorClicked: (() -> Unit)? = null, - authorClickTooltip: String? = null, ) { Row( modifier = modifier, horizontalArrangement = spacedBy(8.dp), verticalAlignment = CenterVertically, ) { - Tooltip( - text = authorClickTooltip ?: "", + Row( modifier = Modifier.weight(1f), + horizontalArrangement = spacedBy(8.dp), + verticalAlignment = CenterVertically, ) { - Row( - modifier = Modifier.modifyIf(onAuthorClicked != null, Modifier.clickable { onAuthorClicked?.invoke() }), - horizontalArrangement = spacedBy(8.dp), - verticalAlignment = CenterVertically, - ) { - ProfileCircle(avatarSize, author.id, authorInfo) - Text( - modifier = Modifier.weight(1f, fill = false), - text = getContactDisplayName(author.name, authorInfo.alias), - fontWeight = if (authorInfo.status == OURSELVES) Bold else null, - maxLines = 1, - overflow = Ellipsis, - ) - TrustIndicatorShort(authorInfo.status) - } + ProfileCircle(avatarSize, author.id, authorInfo) + Text( + modifier = Modifier.weight(1f, fill = false), + text = getContactDisplayName(author.name, authorInfo.alias), + fontWeight = if (authorInfo.status == OURSELVES) Bold else null, + maxLines = 1, + overflow = Ellipsis, + ) + TrustIndicatorShort(authorInfo.status) } Text( text = TimeUtils.getFormattedTimestamp(timestamp),