From 315e7e4afe30f29ddb68c47e8b3e2acd572976db Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Wed, 23 Apr 2025 17:30:34 +0300 Subject: [PATCH] fixup! fix: apply API changes --- .../ru/sweetbread/unn/ui/composes/Blogpost.kt | 47 +++---------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/ru/sweetbread/unn/ui/composes/Blogpost.kt b/app/src/main/java/ru/sweetbread/unn/ui/composes/Blogpost.kt index 4260c20..b1a796b 100644 --- a/app/src/main/java/ru/sweetbread/unn/ui/composes/Blogpost.kt +++ b/app/src/main/java/ru/sweetbread/unn/ui/composes/Blogpost.kt @@ -1,3 +1,8 @@ +/* + * Created by sweetbread + * Copyright (c) 2025. All rights reserved. + */ + package ru.sweetbread.unn.ui.composes import android.text.util.Linkify @@ -47,7 +52,6 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import org.kefirsf.bb.BBProcessorFactory -import org.kefirsf.bb.TextProcessor import ru.sweetbread.unn.AvatarSet import ru.sweetbread.unn.Post import ru.sweetbread.unn.R @@ -174,7 +178,7 @@ fun PostItem(modifier: Modifier = Modifier, post: Post, extended: Boolean = fals LaunchedEffect(post) { - html = toHtml(processor, post) + html = post.content 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)) { - "${it.groups[2]?.value}" - }.replace("""\[FONT=(.+?)](.*?)\[/FONT]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - "${it.groups[2]?.value}" - }.replace("""\[SIZE=(.+?)](.*?)\[/SIZE]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - "${it.groups[2]?.value}" - }.replace( - """\[CENTER]\[JUSTIFY]\[CENTER](.*?)\[/CENTER]\[/JUSTIFY]\[/CENTER]""".toRegex( - RegexOption.DOT_MATCHES_ALL - ) - ) { - "${it.groups[1]?.value}
" - }.replace("""\[CENTER](.*?)\[/CENTER]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - "${it.groups[1]?.value}
" - }.replace("""\[JUSTIFY](.*?)\[/JUSTIFY]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - "${it.groups[1]?.value}
" - }.replace("""\[B](.*?)\[/B]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - "${it.groups[1]?.value}" - }.replace("""\[U](.*?)\[/U]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - "${it.groups[1]?.value}" - }.replace("""\[P](.*?)\[/P]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - "

${it.groups[1]?.value}

" - /*}.replace("""\[DISK FILE ID=n(\d+)]""".toRegex(RegexOption.DOT_MATCHES_ALL)) { - ""*/ - }.replace("""\[IMG .+].+?\[/IMG]""".toRegex(RegexOption.DOT_MATCHES_ALL), "") - /*.replace("\n", "\n
")*/ - - Log.d("toHTML | result", result) - - return result -} - @Preview @Composable