From e86db40fd6902270b2406e719391a3000fa98893 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 28 Sep 2022 20:56:45 +0530 Subject: [PATCH] refactor(common): make `Submitter` take in an `AnnotatedString` --- .../dev/msfjarvis/claw/common/comments/CommentEntry.kt | 5 +++-- .../kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt index ec2b8dfa..2104ffaa 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt @@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalUriHandler +import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import dev.msfjarvis.claw.common.posts.PostActions @@ -73,7 +74,7 @@ fun CommentsHeader( Spacer(Modifier.height(4.dp)) } Submitter( - text = "Submitted by ${postDetails.submitter.username}", + text = AnnotatedString("Submitted by ${postDetails.submitter.username}"), avatarUrl = "https://lobste.rs/${postDetails.submitter.avatarUrl}", contentDescription = "User avatar for ${postDetails.submitter.username}", modifier = @@ -140,7 +141,7 @@ fun CommentEntry( ) { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Submitter( - text = comment.user.username, + text = AnnotatedString(comment.user.username), avatarUrl = "https://lobste.rs/${comment.user.avatarUrl}", contentDescription = "User avatar for ${comment.user.username}", modifier = diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt index 43050303..bcdc7cd5 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt @@ -37,6 +37,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.google.accompanist.flowlayout.FlowRow @@ -109,7 +110,7 @@ fun PostDetails(post: SavedPost, modifier: Modifier = Modifier) { TagRow(tags = post.tags) Spacer(Modifier.height(4.dp)) Submitter( - text = "Submitted by ${post.submitterName}", + text = AnnotatedString("Submitted by ${post.submitterName}"), avatarUrl = "https://lobste.rs/${post.submitterAvatarUrl}", contentDescription = "User avatar for ${post.submitterName}", ) @@ -131,7 +132,7 @@ fun PostTitle( @Composable fun Submitter( - text: String, + text: AnnotatedString, avatarUrl: String, contentDescription: String, modifier: Modifier = Modifier,