geesawra.industries
A cheap attempt at a native Bluesky client for Android
Skeets: use theme color for annotated text links
Use the `onSurface` color from the `MaterialTheme` for links and mentions in skeet content. This ensures the link color adapts to the current theme (e.g., light or dark mode) instead of being a hardcoded blue.
The `annotatedContent()` function is now a `@Composable` to access the theme's color scheme.
+6
-4
+6
-4
app/src/main/java/industries/geesawra/monarch/datalayer/Models.kt
+6
-4
app/src/main/java/industries/geesawra/monarch/datalayer/Models.kt
···
2
2
3
3
package industries.geesawra.monarch.datalayer
4
4
5
-
import androidx.compose.ui.graphics.Color
5
+
import androidx.compose.material3.MaterialTheme
6
+
import androidx.compose.runtime.Composable
6
7
import androidx.compose.ui.text.AnnotatedString
7
8
import androidx.compose.ui.text.LinkAnnotation
8
9
import androidx.compose.ui.text.SpanStyle
···
339
340
data class WithAnnotation(val data: Facet, val content: String) : AnnotatedData()
340
341
}
341
342
343
+
@Composable
342
344
fun annotatedContent(): AnnotatedString {
343
345
if (this.facets.isEmpty()) {
344
346
return buildAnnotatedString {
···
380
382
is FacetFeatureUnion.Link -> withLink(
381
383
LinkAnnotation.Url(
382
384
f.value.uri.uri,
383
-
TextLinkStyles(style = SpanStyle(color = Color.Blue))
385
+
TextLinkStyles(style = SpanStyle(color = MaterialTheme.colorScheme.onSurface))
384
386
)
385
387
) {
386
388
append(content.content)
···
389
391
is FacetFeatureUnion.Mention -> withLink(
390
392
LinkAnnotation.Url(
391
393
f.value.did.did,
392
-
TextLinkStyles(style = SpanStyle(color = Color.Blue))
394
+
TextLinkStyles(style = SpanStyle(color = MaterialTheme.colorScheme.onSurface))
393
395
)
394
396
) {
395
397
append(
···
399
401
400
402
is FacetFeatureUnion.Tag -> withStyle(
401
403
SpanStyle(
402
-
color = Color.Blue
404
+
color = MaterialTheme.colorScheme.onSurface
403
405
)
404
406
)
405
407
{