From 99189f0ba5340aa9a699252c3530f72a62868f0c Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 2 Dec 2022 10:02:07 +0100 Subject: [PATCH] Change link text color --- .../components/MessagesTimelineItemTextView.kt | 12 ++++-------- .../messages/components/html/HtmlDocument.kt | 3 ++- .../java/io/element/android/x/designsystem/Color.kt | 2 ++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemTextView.kt b/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemTextView.kt index 0b9a1f8211..26fd802bc5 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemTextView.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemTextView.kt @@ -2,20 +2,17 @@ package io.element.android.x.features.messages.components import android.text.SpannableString import android.text.style.URLSpan -import android.text.util.Linkify -import android.text.util.Linkify.* +import android.text.util.Linkify.PHONE_NUMBERS +import android.text.util.Linkify.WEB_URLS import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalUriHandler -import androidx.compose.ui.platform.UriHandler -import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.core.text.util.LinkifyCompat +import io.element.android.x.designsystem.LinkColor import io.element.android.x.designsystem.components.ClickableLinkText import io.element.android.x.features.messages.components.html.HtmlDocument import io.element.android.x.features.messages.model.content.MessagesTimelineItemTextBasedContent @@ -38,10 +35,9 @@ fun MessagesTimelineItemTextView( interactionSource = interactionSource ) } else { - val uriHandler = LocalUriHandler.current Box(modifier) { val linkStyle = SpanStyle( - color = Color.Blue, + color = LinkColor, ) val styledText = remember(content.body) { content.body.linkify(linkStyle) } ClickableLinkText( diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/components/html/HtmlDocument.kt b/features/messages/src/main/java/io/element/android/x/features/messages/components/html/HtmlDocument.kt index d9b9746d3f..e71769b532 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/components/html/HtmlDocument.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/components/html/HtmlDocument.kt @@ -23,6 +23,7 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.flowlayout.FlowRow +import io.element.android.x.designsystem.LinkColor import io.element.android.x.designsystem.components.ClickableLinkText import io.element.android.x.matrix.permalink.PermalinkData import io.element.android.x.matrix.permalink.PermalinkParser @@ -499,7 +500,7 @@ private fun AnnotatedString.Builder.appendLink(link: Element) { is PermalinkData.FallbackLink -> { pushStringAnnotation(tag = "URL", annotation = link.ownText()) withStyle( - style = SpanStyle(color = Color.Blue) + style = SpanStyle(color = LinkColor) ) { append(link.ownText()) } diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt index 4ad0a1e99a..0bc41fb0d3 100644 --- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt +++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt @@ -39,3 +39,5 @@ val Vermilion = Color(0xFFFF5B55) val MessageHighlightLight = Azure // TODO Update color val MessageHighlightDark = Azure + +val LinkColor = Color(0xFF054F6E) \ No newline at end of file