letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Change link text color

Browse Source
This commit is contained in:
ganfra
2022-12-02 10:02:07 +01:00
parent f76422ad48
commit 99189f0ba5
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemTextView.kt
View File

@@ -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(

3
features/messages/src/main/java/io/element/android/x/features/messages/components/html/HtmlDocument.kt
View File

@@ -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())
}

2
libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt
View File

@@ -39,3 +39,5 @@ val Vermilion = Color(0xFFFF5B55)
val MessageHighlightLight = Azure
// TODO Update color
val MessageHighlightDark = Azure
val LinkColor = Color(0xFF054F6E)