msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 08:17:04 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor(common): make Submitter take in an AnnotatedString

Browse source
This commit is contained in:
Harsh Shandilya 2022-09-28 20:56:45 +05:30
parent 84c0abbf58
commit e86db40fd6
No known key found for this signature in database
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt
View file

@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import dev.msfjarvis.claw.common.posts.PostActions import dev.msfjarvis.claw.common.posts.PostActions
@ -73,7 +74,7 @@ fun CommentsHeader(
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
} }
Submitter( Submitter(
text = "Submitted by ${postDetails.submitter.username}", text = AnnotatedString("Submitted by ${postDetails.submitter.username}"),
avatarUrl = "https://lobste.rs/${postDetails.submitter.avatarUrl}", avatarUrl = "https://lobste.rs/${postDetails.submitter.avatarUrl}",
contentDescription = "User avatar for ${postDetails.submitter.username}", contentDescription = "User avatar for ${postDetails.submitter.username}",
modifier = modifier =
@ -140,7 +141,7 @@ fun CommentEntry(
) { ) {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
Submitter( Submitter(
text = comment.user.username, text = AnnotatedString(comment.user.username),
avatarUrl = "https://lobste.rs/${comment.user.avatarUrl}", avatarUrl = "https://lobste.rs/${comment.user.avatarUrl}",
contentDescription = "User avatar for ${comment.user.username}", contentDescription = "User avatar for ${comment.user.username}",
modifier = modifier =

5
common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt
View file

@ -37,6 +37,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.flowlayout.FlowRow
@ -109,7 +110,7 @@ fun PostDetails(post: SavedPost, modifier: Modifier = Modifier) {
TagRow(tags = post.tags) TagRow(tags = post.tags)
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
Submitter( Submitter(
text = "Submitted by ${post.submitterName}", text = AnnotatedString("Submitted by ${post.submitterName}"),
avatarUrl = "https://lobste.rs/${post.submitterAvatarUrl}", avatarUrl = "https://lobste.rs/${post.submitterAvatarUrl}",
contentDescription = "User avatar for ${post.submitterName}", contentDescription = "User avatar for ${post.submitterName}",
) )
@ -131,7 +132,7 @@ fun PostTitle(
@Composable @Composable
fun Submitter( fun Submitter(
text: String, text: AnnotatedString,
avatarUrl: String, avatarUrl: String,
contentDescription: String, contentDescription: String,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,