fixup! fix: apply API changes
This commit is contained in:
parent
55ff6e6cd1
commit
315e7e4afe
@ -1,3 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* Created by sweetbread
|
||||||
|
* Copyright (c) 2025. All rights reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
package ru.sweetbread.unn.ui.composes
|
package ru.sweetbread.unn.ui.composes
|
||||||
|
|
||||||
import android.text.util.Linkify
|
import android.text.util.Linkify
|
||||||
@ -47,7 +52,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
|
|||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
import kotlinx.coroutines.flow.asStateFlow
|
import kotlinx.coroutines.flow.asStateFlow
|
||||||
import org.kefirsf.bb.BBProcessorFactory
|
import org.kefirsf.bb.BBProcessorFactory
|
||||||
import org.kefirsf.bb.TextProcessor
|
|
||||||
import ru.sweetbread.unn.AvatarSet
|
import ru.sweetbread.unn.AvatarSet
|
||||||
import ru.sweetbread.unn.Post
|
import ru.sweetbread.unn.Post
|
||||||
import ru.sweetbread.unn.R
|
import ru.sweetbread.unn.R
|
||||||
@ -174,7 +178,7 @@ fun PostItem(modifier: Modifier = Modifier, post: Post, extended: Boolean = fals
|
|||||||
|
|
||||||
|
|
||||||
LaunchedEffect(post) {
|
LaunchedEffect(post) {
|
||||||
html = toHtml(processor, post)
|
html = post.content
|
||||||
user = getUserByBitrixId(post.authorId)
|
user = getUserByBitrixId(post.authorId)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -218,45 +222,6 @@ fun PostItem(modifier: Modifier = Modifier, post: Post, extended: Boolean = fals
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun toHtml(
|
|
||||||
processor: TextProcessor,
|
|
||||||
post: Post
|
|
||||||
): String {
|
|
||||||
Log.d("toHTML | original", post.content)
|
|
||||||
|
|
||||||
val result =
|
|
||||||
post.content.replace("""\[URL=(.+?)](.+?)\[/URL]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<a href=\"${it.groups[1]?.value}\">${it.groups[2]?.value}</a>"
|
|
||||||
}.replace("""\[FONT=(.+?)](.*?)\[/FONT]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<span style=\"font-family: ${it.groups[1]?.value}\">${it.groups[2]?.value}</span>"
|
|
||||||
}.replace("""\[SIZE=(.+?)](.*?)\[/SIZE]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<span style=\"font-size: ${it.groups[1]?.value}\">${it.groups[2]?.value}</span>"
|
|
||||||
}.replace(
|
|
||||||
"""\[CENTER]\[JUSTIFY]\[CENTER](.*?)\[/CENTER]\[/JUSTIFY]\[/CENTER]""".toRegex(
|
|
||||||
RegexOption.DOT_MATCHES_ALL
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
"<span style=\"text-align: center;\">${it.groups[1]?.value}</span><br>"
|
|
||||||
}.replace("""\[CENTER](.*?)\[/CENTER]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<span style=\"text-align: center;\">${it.groups[1]?.value}</span><br>"
|
|
||||||
}.replace("""\[JUSTIFY](.*?)\[/JUSTIFY]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<span style=\"text-align: justify;\">${it.groups[1]?.value}</span><br>"
|
|
||||||
}.replace("""\[B](.*?)\[/B]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<b>${it.groups[1]?.value}</b>"
|
|
||||||
}.replace("""\[U](.*?)\[/U]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<u>${it.groups[1]?.value}</u>"
|
|
||||||
}.replace("""\[P](.*?)\[/P]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<p>${it.groups[1]?.value}</p>"
|
|
||||||
/*}.replace("""\[DISK FILE ID=n(\d+)]""".toRegex(RegexOption.DOT_MATCHES_ALL)) {
|
|
||||||
"<img src=\"$portalURL/bitrix/tools/disk/uf.php?attachedId=${it.groups[1]?.value}&action=download&ncc=1\" />"*/
|
|
||||||
}.replace("""\[IMG .+].+?\[/IMG]""".toRegex(RegexOption.DOT_MATCHES_ALL), "")
|
|
||||||
/*.replace("\n", "\n<br>")*/
|
|
||||||
|
|
||||||
Log.d("toHTML | result", result)
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Preview
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
|
Loading…
x
Reference in New Issue
Block a user