highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-10 10:32:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hashtags in front of a sentence ending should nod work, too.

Browse Source
This commit is contained in:
Believethehype
2023-03-17 13:17:19 +01:00
parent f266a9e964
commit 52978fa237
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
View File

@@ -50,7 +50,7 @@ val noProtocolUrlValidator = Pattern.compile("^[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.
val tagIndex = Pattern.compile(".*\\#\\[([0-9]+)\\].*") val tagIndex = Pattern.compile(".*\\#\\[([0-9]+)\\].*")
val mentionsPattern: Pattern = Pattern.compile("@([A-Za-z0-9_\\-]+)") val mentionsPattern: Pattern = Pattern.compile("@([A-Za-z0-9_\\-]+)")
val hashTagsPattern: Pattern = Pattern.compile("#([A-Za-z0-9_\\-]+)") val hashTagsPattern: Pattern = Pattern.compile("#([A-Za-z0-9_\\-]+\\.?+\\,?+\\??+\\!?+\\;?+\\-?)")
val urlPattern: Pattern = Patterns.WEB_URL val urlPattern: Pattern = Patterns.WEB_URL
fun isValidURL(url: String?): Boolean { fun isValidURL(url: String?): Boolean {
@@ -148,7 +148,21 @@ fun RichTextViewer(
} else if (tagIndex.matcher(word).matches() && tags != null) { } else if (tagIndex.matcher(word).matches() && tags != null) {
TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController) TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
} else if (hashTagsPattern.matcher(word).matches()) { } else if (hashTagsPattern.matcher(word).matches()) {
if (word.endsWith(".") || word.endsWith(",") || word.endsWith("?") || word.endsWith("!") || word.endsWith(";") || word.endsWith("-")) {
var wordwithoutsuffix = word.removeRange(word.length - 1, word.length)
var suffix = word.last()
HashTag(wordwithoutsuffix, accountViewModel, navController)
Text(
text = "$suffix ",
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
} else {
HashTag(word, accountViewModel, navController) HashTag(word, accountViewModel, navController)
Text(
text = " ",
style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
}
} else if (isBechLink(word)) { } else if (isBechLink(word)) {
BechLink(word, navController) BechLink(word, navController)
} else { } else {
@@ -232,14 +246,9 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
} }
if (tag != null) { if (tag != null) {
var txt = AnnotatedString("#$tag ")
val hashtagIcon = checkForHashtagWithIcon(tag) val hashtagIcon = checkForHashtagWithIcon(tag)
if (hashtagIcon != null) {
txt = AnnotatedString("#$tag")
}
ClickableText( ClickableText(
text = txt, text = AnnotatedString("#$tag"),
onClick = { navController.navigate("Hashtag/$tag") }, onClick = { navController.navigate("Hashtag/$tag") },
style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary) style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
) )