Revert "Revert "fix(common): make text in comments screen selectable""

This reverts commit 401214794d.
This commit is contained in:
Harsh Shandilya 2023-07-19 21:58:08 +05:30
parent e48a6d41d5
commit c5ec6cd680

View file

@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Public import androidx.compose.material.icons.filled.Public
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -70,7 +71,7 @@ internal fun CommentsHeader(
modifier = Modifier.padding(16.dp).fillMaxWidth(), modifier = Modifier.padding(16.dp).fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
PostTitle(title = postDetails.title) SelectionContainer { PostTitle(title = postDetails.title) }
TagRow(tags = postDetails.tags.toImmutableList()) TagRow(tags = postDetails.tags.toImmutableList())
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
@ -84,7 +85,9 @@ internal fun CommentsHeader(
} }
if (postDetails.description.isNotBlank()) { if (postDetails.description.isNotBlank()) {
ThemedRichText(htmlConverter.convertHTMLToMarkdown(postDetails.description)) SelectionContainer {
ThemedRichText(htmlConverter.convertHTMLToMarkdown(postDetails.description))
}
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
} }
Submitter( Submitter(
@ -169,10 +172,12 @@ internal fun CommentEntry(
Modifier.clickable { uriHandler.openUri("https://lobste.rs/u/${comment.user.username}") }, Modifier.clickable { uriHandler.openUri("https://lobste.rs/u/${comment.user.username}") },
) )
if (commentNode.isExpanded) { if (commentNode.isExpanded) {
ThemedRichText( SelectionContainer {
text = htmlConverter.convertHTMLToMarkdown(comment.comment), ThemedRichText(
modifier = Modifier.padding(top = 8.dp) text = htmlConverter.convertHTMLToMarkdown(comment.comment),
) modifier = Modifier.padding(top = 8.dp)
)
}
} }
} }
} }