nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improving rendering of the text

Browse Source
This commit is contained in:
Vitor Pamplona
2023-05-31 20:43:57 -04:00
parent ed919ae531
commit 8575ea018d
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+13 -9
View File
@@ -178,13 +178,17 @@ private fun RenderWord(
nav: (String) -> Unit,
tags: List<List<String>>?
) {
val wordSpace = remember {
"$word "
}
if (canPreview) {
// Explicit URL
val img = state.imagesForPager[word]
if (img != null) {
ZoomableContentView(img, state.imageList)
} else if (state.urlSet.contains(word)) {
UrlPreview(word, "$word ")
UrlPreview(word, wordSpace)
} else if (state.customEmoji.any { word.contains(it.key) }) {
RenderCustomEmoji(word, state.customEmoji)
} else if (word.startsWith("lnbc", true)) {
@@ -217,7 +221,7 @@ private fun RenderWord(
HashTag(word, nav)
} else {
Text(
text = "$word ",
text = wordSpace,
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}
@@ -232,26 +236,26 @@ private fun RenderWord(
Text("$additionalChars ")
} else {
Text(
text = "$word ",
text = wordSpace,
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}
} else {
Text(
text = "$word ",
text = wordSpace,
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}
} else {
if (state.urlSet.contains(word)) {
ClickableUrl("$word ", word)
ClickableUrl(wordSpace, word)
} else if (word.startsWith("lnurl", true)) {
val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word)
if (lnWithdrawal != null) {
ClickableWithdrawal(withdrawalString = lnWithdrawal)
} else {
Text(
text = "$word ",
text = wordSpace,
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}
@@ -283,7 +287,7 @@ private fun RenderWord(
HashTag(word, nav)
} else {
Text(
text = "$word ",
text = wordSpace,
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}
@@ -298,13 +302,13 @@ private fun RenderWord(
Text("$additionalChars ")
} else {
Text(
text = "$word ",
text = wordSpace,
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}
} else {
Text(
text = "$word ",
text = wordSpace,
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}