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

fix: downgrade to Compose stable

Browse source 
Fixes PP-56
Fixes PP-61
Fixes COMPOSE-LOBSTERS-3Z
Fixes COMPOSE-LOBSTERS-40
This commit is contained in:
Harsh Shandilya 2024-05-07 14:02:08 +05:30
parent 9fe6e34015
commit 6f76a15ded
3 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

49
common/src/main/kotlin/dev/msfjarvis/claw/common/user/UserProfile.kt
View file

@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.ClickableText
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccountCircle
import androidx.compose.material3.MaterialTheme
@ -24,8 +25,10 @@ import androidx.compose.runtime.produceState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.LinkAnnotation
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.dp
import com.github.michaelbull.result.coroutines.runSuspendCatching
import com.github.michaelbull.result.fold
@ -104,18 +107,42 @@ private fun UserProfileInternal(
Text(text = user.username, style = MaterialTheme.typography.displaySmall)
ThemedRichText(text = user.about)
user.invitedBy?.let { invitedBy ->
Text(
text =
buildAnnotatedString {
append("Invited by ")
pushLink(
LinkAnnotation.Clickable(
tag = "username",
linkInteractionListener = { openUserProfile(invitedBy) },
)
val text = buildAnnotatedString {
val style =
with(MaterialTheme.typography.bodyMedium) {
SpanStyle(
MaterialTheme.colorScheme.onPrimaryContainer,
fontSize,
fontWeight,
fontStyle,
fontSynthesis,
fontFamily,
fontFeatureSettings,
letterSpacing,
baselineShift,
textGeometricTransform,
localeList,
background,
textDecoration,
shadow,
)
append(invitedBy)
}
withStyle(style = style) { append("Invited by ") }
pushStringAnnotation(tag = "URL", annotation = invitedBy)
withStyle(style = style.copy(textDecoration = TextDecoration.Underline)) {
append(invitedBy)
}
pop()
}
ClickableText(
text = text,
onClick = { offset ->
text
.getStringAnnotations(tag = "URL", start = offset, end = offset)
.firstOrNull()
?.let { annotation -> openUserProfile(annotation.item) }
},
)
}
}