nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-30 00:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

created HttpClient class

Browse Source
This commit is contained in:
greenart7c3 2023-04-26 10:03:51 -03:00
parent 4f8d33d850
commit c648f54b51
23 changed files with 78 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt
View File

@ -5,7 +5,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.navigation.NavController
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import java.net.Proxy
@Composable
fun TranslatableRichTextViewer(
@ -15,8 +14,7 @@ fun TranslatableRichTextViewer(
tags: List<List<String>>?,
backgroundColor: Color,
accountViewModel: AccountViewModel,
navController: NavController,
proxy: Proxy?
navController: NavController
) = ExpandableRichTextViewer(
content,
canPreview,
@ -24,6 +22,5 @@ fun TranslatableRichTextViewer(
tags,
backgroundColor,
accountViewModel,
navController,
proxy
navController
)

3
app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
View File

@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst
import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.service.HttpClient
import com.vitorpamplona.amethyst.service.NostrAccountDataSource
import com.vitorpamplona.amethyst.service.NostrChannelDataSource
import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
@ -25,7 +26,7 @@ object ServiceManager {
fun start() {
val myAccount = account
HttpClient.start(account)
if (myAccount != null) {
Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())

17
app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt Normal file
View File

@ -0,0 +1,17 @@
package com.vitorpamplona.amethyst.service
import com.vitorpamplona.amethyst.model.Account
import okhttp3.OkHttpClient
import java.net.Proxy
object HttpClient {
private var proxy: Proxy? = null
fun start(account: Account?) {
this.proxy = account?.proxy
}
fun getHttpClient(): OkHttpClient {
return OkHttpClient.Builder().proxy(proxy).build()
}
}

6
app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
View File

@ -9,13 +9,11 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.Call
import okhttp3.Callback
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import java.net.Proxy
class Nip05Verifier(proxy: Proxy?) {
val client = OkHttpClient.Builder().proxy(proxy).build()
class Nip05Verifier() {
val client = HttpClient.getHttpClient()
fun assembleUrl(nip05address: String): String? {
val parts = nip05address.trim().split("@")

7
app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
View File

@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service.lnurl
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.vitorpamplona.amethyst.BuildConfig
import com.vitorpamplona.amethyst.service.HttpClient
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@ -10,15 +11,13 @@ import kotlinx.coroutines.withContext
import nostr.postr.Bech32
import okhttp3.Call
import okhttp3.Callback
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import java.math.BigDecimal
import java.net.Proxy
import java.net.URLEncoder
class LightningAddressResolver(proxy: Proxy?) {
val client = OkHttpClient.Builder().proxy(proxy).build()
class LightningAddressResolver() {
val client = HttpClient.getHttpClient()
fun assembleUrl(lnaddress: String): String? {
val parts = lnaddress.split("@")

7
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt
View File

@ -9,12 +9,12 @@ import android.os.Environment
import android.provider.MediaStore
import androidx.annotation.RequiresApi
import com.vitorpamplona.amethyst.BuildConfig
import com.vitorpamplona.amethyst.service.HttpClient
import okhttp3.*
import okio.BufferedSource
import okio.IOException
import okio.sink
import java.io.File
import java.net.Proxy
object ImageSaver {
/**
@ -27,10 +27,9 @@ object ImageSaver {
url: String,
context: Context,
onSuccess: () -> Any?,
onError: (Throwable) -> Any?,
proxy: Proxy?
onError: (Throwable) -> Any?
) {
val client = OkHttpClient.Builder().proxy(proxy).build()
val client = HttpClient.getHttpClient()
val request = Request.Builder()
.header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")

7
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
View File

@ -4,12 +4,12 @@ import android.content.ContentResolver
import android.net.Uri
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.vitorpamplona.amethyst.BuildConfig
import com.vitorpamplona.amethyst.service.HttpClient
import okhttp3.*
import okhttp3.MediaType.Companion.toMediaType
import okio.BufferedSink
import okio.source
import java.io.IOException
import java.net.Proxy
import java.util.*
object ImageUploader {
@ -17,15 +17,14 @@ object ImageUploader {
uri: Uri,
contentResolver: ContentResolver,
onSuccess: (String) -> Unit,
onError: (Throwable) -> Unit,
proxy: Proxy?
onError: (Throwable) -> Unit
) {
val contentType = contentResolver.getType(uri)
val category = contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
val url = if (category == "image") "https://api.imgur.com/3/image" else "https://api.imgur.com/3/upload"
val client = OkHttpClient.Builder().proxy(proxy).build()
val client = HttpClient.getHttpClient()
val requestBody: RequestBody = MultipartBody.Builder()
.setType(MultipartBody.FORM)

3
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
View File

@ -124,8 +124,7 @@ open class NewPostViewModel : ViewModel() {
viewModelScope.launch {
imageUploadingError.emit("Failed to upload the image / video")
}
},
account!!.proxy
}
)
}

3
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt
View File

@ -180,8 +180,7 @@ class NewUserMetadataViewModel : ViewModel() {
viewModelScope.launch {
imageUploadingError.emit("Failed to upload the image / video")
}
},
account.proxy
}
)
}
}

6
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt
View File

@ -18,7 +18,6 @@ import com.google.accompanist.permissions.isGranted
import com.google.accompanist.permissions.rememberPermissionState
import com.vitorpamplona.amethyst.R
import kotlinx.coroutines.launch
import java.net.Proxy
/**
* A button to save the remote image to the gallery.
@ -28,7 +27,7 @@ import java.net.Proxy
*/
@OptIn(ExperimentalPermissionsApi::class)
@Composable
fun SaveToGallery(url: String, proxy: Proxy?) {
fun SaveToGallery(url: String) {
val localContext = LocalContext.current
val scope = rememberCoroutineScope()
@ -55,8 +54,7 @@ fun SaveToGallery(url: String, proxy: Proxy?) {
)
.show()
}
},
proxy = proxy
}
)
}

7
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt
View File

@ -27,7 +27,6 @@ import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import java.net.Proxy
const val SHORT_TEXT_LENGTH = 350
@ -39,8 +38,7 @@ fun ExpandableRichTextViewer(
tags: List<List<String>>?,
backgroundColor: Color,
accountViewModel: AccountViewModel,
navController: NavController,
proxy: Proxy?
navController: NavController
) {
var showFullText by remember { mutableStateOf(false) }
@ -64,8 +62,7 @@ fun ExpandableRichTextViewer(
tags,
backgroundColor,
accountViewModel,
navController,
proxy
navController
)
if (content.length > whereToCut && !showFullText) {

2
app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt
View File

@ -138,7 +138,7 @@ fun InvoiceRequest(
onClick = {
val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, LnZapEvent.ZapType.PUBLIC)
LightningAddressResolver(account.proxy).lnAddressInvoice(
LightningAddressResolver().lnAddressInvoice(
lud16,
amount * 1000,
message,

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

@ -43,7 +43,6 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.net.MalformedURLException
import java.net.Proxy
import java.net.URISyntaxException
import java.net.URL
import java.util.regex.Pattern
@ -81,8 +80,7 @@ fun RichTextViewer(
tags: List<List<String>>?,
backgroundColor: Color,
accountViewModel: AccountViewModel,
navController: NavController,
proxy: Proxy?
navController: NavController
) {
Column(modifier = modifier) {
if (content.startsWith("# ") ||
@ -161,9 +159,9 @@ fun RichTextViewer(
if (isValidURL(word)) {
val removedParamsFromUrl = word.split("?")[0].lowercase()
if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
ZoomableImageView(word, imagesForPager, proxy)
ZoomableImageView(word, imagesForPager)
} else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
ZoomableImageView(word, imagesForPager, proxy)
ZoomableImageView(word, imagesForPager)
} else {
UrlPreview(word, "$word ")
}

9
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt
View File

@ -46,11 +46,10 @@ import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
import net.engawapg.lib.zoomable.rememberZoomState
import net.engawapg.lib.zoomable.zoomable
import java.net.Proxy
@Composable
@OptIn(ExperimentalFoundationApi::class)
fun ZoomableImageView(word: String, images: List<String> = listOf(word), proxy: Proxy?) {
fun ZoomableImageView(word: String, images: List<String> = listOf(word)) {
val clipboardManager = LocalClipboardManager.current
// store the dialog open or close state
@ -127,13 +126,13 @@ fun ZoomableImageView(word: String, images: List<String> = listOf(word), proxy:
}
if (dialogOpen) {
ZoomableImageDialog(word, images, onDismiss = { dialogOpen = false }, proxy)
ZoomableImageDialog(word, images, onDismiss = { dialogOpen = false })
}
}
@OptIn(ExperimentalPagerApi::class)
@Composable
fun ZoomableImageDialog(imageUrl: String, allImages: List<String> = listOf(imageUrl), onDismiss: () -> Unit, proxy: Proxy?) {
fun ZoomableImageDialog(imageUrl: String, allImages: List<String> = listOf(imageUrl), onDismiss: () -> Unit) {
Dialog(
onDismissRequest = onDismiss,
properties = DialogProperties(usePlatformDefaultWidth = false)
@ -151,7 +150,7 @@ fun ZoomableImageDialog(imageUrl: String, allImages: List<String> = listOf(image
) {
CloseButton(onCancel = onDismiss)
SaveToGallery(url = allImages[pagerState.currentPage], proxy)
SaveToGallery(url = allImages[pagerState.currentPage])
}
if (allImages.size > 1) {

6
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
View File

@ -290,8 +290,7 @@ fun ChatroomMessageCompose(
note.event?.tags(),
backgroundBubbleColor,
accountViewModel,
navController,
account.proxy
navController
)
} else {
TranslatableRichTextViewer(
@ -301,8 +300,7 @@ fun ChatroomMessageCompose(
note.event?.tags(),
backgroundBubbleColor,
accountViewModel,
navController,
account.proxy
navController
)
}
}

17
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt
View File

@ -35,11 +35,10 @@ import com.vitorpamplona.amethyst.service.Nip05Verifier
import com.vitorpamplona.amethyst.ui.theme.Nip05
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.net.Proxy
import java.util.Date
@Composable
fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String, proxy: Proxy?): State<Boolean?> {
fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String): State<Boolean?> {
var nip05Verified = remember { mutableStateOf<Boolean?>(null) }
LaunchedEffect(key1 = user) {
@ -49,7 +48,7 @@ fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String, proxy: Prox
if ((user.nip05LastVerificationTime ?: 0) > (now - 60 * 60)) { // 1hour
nip05Verified.value = user.nip05Verified
} else {
Nip05Verifier(proxy).verifyNip05(
Nip05Verifier().verifyNip05(
nip05,
onSuccess = {
// Marks user as verified
@ -78,18 +77,18 @@ fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String, proxy: Prox
}
@Composable
fun ObserveDisplayNip05Status(baseNote: Note, columnModifier: Modifier = Modifier, proxy: Proxy?) {
fun ObserveDisplayNip05Status(baseNote: Note, columnModifier: Modifier = Modifier) {
val noteState by baseNote.live().metadata.observeAsState()
val note = noteState?.note ?: return
val author = note.author
if (author != null) {
ObserveDisplayNip05Status(author, columnModifier, proxy)
ObserveDisplayNip05Status(author, columnModifier)
}
}
@Composable
fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifier, proxy: Proxy?) {
fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifier) {
val userState by baseUser.live().metadata.observeAsState()
val user = userState?.user ?: return
@ -108,7 +107,7 @@ fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifie
)
}
val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex, proxy)
val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex)
if (nip05Verified == null) {
Icon(
tint = Color.Yellow,
@ -152,12 +151,12 @@ fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifie
}
@Composable
fun DisplayNip05ProfileStatus(user: User, proxy: Proxy?) {
fun DisplayNip05ProfileStatus(user: User) {
val uri = LocalUriHandler.current
user.nip05()?.let { nip05 ->
if (nip05.split("@").size == 2) {
val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex, proxy)
val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex)
Row(verticalAlignment = Alignment.CenterVertically) {
if (nip05Verified == null) {
Icon(

11
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
View File

@ -353,7 +353,7 @@ fun NoteComposeInner(
if (note.author != null && !makeItShort && !isQuotedNote) {
Row(verticalAlignment = Alignment.CenterVertically) {
ObserveDisplayNip05Status(note.author!!, Modifier.weight(1f), account.proxy)
ObserveDisplayNip05Status(note.author!!, Modifier.weight(1f))
val baseReward = noteEvent.getReward()
if (baseReward != null) {
@ -509,8 +509,7 @@ fun NoteComposeInner(
noteEvent.tags(),
backgroundColor,
accountViewModel,
navController,
account.proxy
navController
)
if (!makeItShort) {
@ -540,8 +539,7 @@ fun NoteComposeInner(
noteEvent.tags(),
backgroundColor,
accountViewModel,
navController,
account.proxy
navController
)
DisplayUncitedHashtags(noteEvent.hashtags(), eventContent, navController)
@ -553,8 +551,7 @@ fun NoteComposeInner(
canPreview = canPreview && !makeItShort,
backgroundColor,
accountViewModel,
navController,
account.proxy
navController
)
}
}

10
app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
View File

@ -37,7 +37,6 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import java.net.Proxy
import java.util.*
import kotlin.math.roundToInt
@ -47,8 +46,7 @@ fun PollNote(
canPreview: Boolean,
backgroundColor: Color,
accountViewModel: AccountViewModel,
navController: NavController,
proxy: Proxy?
navController: NavController
) {
val zapsState by baseNote.live().zaps.observeAsState()
val zappedNote = zapsState?.note ?: return
@ -113,8 +111,7 @@ fun PollNote(
pollViewModel.pollEvent?.tags(),
backgroundColor,
accountViewModel,
navController,
proxy
navController
)
}
}
@ -147,8 +144,7 @@ fun PollNote(
pollViewModel.pollEvent?.tags(),
backgroundColor,
accountViewModel,
navController,
proxy
navController
)
}
}

8
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
View File

@ -282,7 +282,7 @@ fun NoteMaster(
}
Row(verticalAlignment = Alignment.CenterVertically) {
ObserveDisplayNip05Status(baseNote, Modifier.weight(1f), account.proxy)
ObserveDisplayNip05Status(baseNote, Modifier.weight(1f))
val baseReward = noteEvent.getReward()
if (baseReward != null) {
@ -362,8 +362,7 @@ fun NoteMaster(
note.event?.tags(),
MaterialTheme.colors.background,
accountViewModel,
navController,
account.proxy
navController
)
DisplayUncitedHashtags(noteEvent.hashtags(), eventContent, navController)
@ -374,8 +373,7 @@ fun NoteMaster(
canPreview,
backgroundColor,
accountViewModel,
navController,
account.proxy
navController
)
}
}

2
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@ -72,7 +72,7 @@ class AccountViewModel(private val account: Account) : ViewModel() {
onProgress(0.10f)
LightningAddressResolver(account.proxy).lnAddressInvoice(
LightningAddressResolver().lnAddressInvoice(
lud16,
amount,
message,

7
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
View File

@ -59,7 +59,6 @@ import com.vitorpamplona.amethyst.ui.note.UserPicture
import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
import com.vitorpamplona.amethyst.ui.screen.ChatroomFeedView
import com.vitorpamplona.amethyst.ui.screen.NostrChatRoomFeedViewModel
import java.net.Proxy
@Composable
fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navController: NavController) {
@ -105,7 +104,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
Column(Modifier.fillMaxHeight()) {
NostrChatroomDataSource.withUser?.let {
ChatroomHeader(it, account.userProfile(), navController = navController, account.proxy)
ChatroomHeader(it, account.userProfile(), navController = navController)
}
Column(
@ -207,7 +206,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
}
@Composable
fun ChatroomHeader(baseUser: User, accountUser: User, navController: NavController, proxy: Proxy?) {
fun ChatroomHeader(baseUser: User, accountUser: User, navController: NavController) {
Column(
modifier = Modifier.clickable(
onClick = { navController.navigate("User/${baseUser.pubkeyHex}") }
@ -227,7 +226,7 @@ fun ChatroomHeader(baseUser: User, accountUser: User, navController: NavControll
}
Row(verticalAlignment = Alignment.CenterVertically) {
ObserveDisplayNip05Status(baseUser, proxy = proxy)
ObserveDisplayNip05Status(baseUser)
}
}
}

14
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
View File

@ -1,7 +1,6 @@
package com.vitorpamplona.amethyst.ui.screen.loggedIn
import android.content.Intent
import java.net.Proxy
import android.net.Uri
import androidx.compose.foundation.*
import androidx.compose.foundation.gestures.scrollBy
@ -309,7 +308,7 @@ private fun ProfileHeader(
val clipboardManager = LocalClipboardManager.current
Box {
DrawBanner(baseUser, account.proxy)
DrawBanner(baseUser)
Box(
modifier = Modifier
@ -411,7 +410,7 @@ private fun ProfileHeader(
}
if (zoomImageDialogOpen) {
ZoomableImageDialog(baseUser.profilePicture()!!, onDismiss = { zoomImageDialogOpen = false }, proxy = account.proxy)
ZoomableImageDialog(baseUser.profilePicture()!!, onDismiss = { zoomImageDialogOpen = false })
}
}
@ -515,7 +514,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
}
}
DisplayNip05ProfileStatus(user, account.proxy)
DisplayNip05ProfileStatus(user)
val website = user.info?.website
if (!website.isNullOrEmpty()) {
@ -617,8 +616,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
tags = null,
backgroundColor = MaterialTheme.colors.background,
accountViewModel = accountViewModel,
navController = navController,
proxy = account.proxy
navController = navController
)
}
}
@ -688,7 +686,7 @@ fun BadgeThumb(
@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun DrawBanner(baseUser: User, proxy: Proxy?) {
private fun DrawBanner(baseUser: User) {
val userState by baseUser.live().metadata.observeAsState()
val user = userState?.user ?: return
@ -714,7 +712,7 @@ private fun DrawBanner(baseUser: User, proxy: Proxy?) {
)
if (zoomImageDialogOpen) {
ZoomableImageDialog(imageUrl = banner, onDismiss = { zoomImageDialogOpen = false }, proxy = proxy)
ZoomableImageDialog(imageUrl = banner, onDismiss = { zoomImageDialogOpen = false })
}
} else {
Image(

7
app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt
View File

@ -35,7 +35,6 @@ import com.vitorpamplona.amethyst.service.lang.ResultOrError
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.net.Proxy
import java.util.Locale
@Composable
@ -46,8 +45,7 @@ fun TranslatableRichTextViewer(
tags: List<List<String>>?,
backgroundColor: Color,
accountViewModel: AccountViewModel,
navController: NavController,
proxy: Proxy?
navController: NavController
) {
val translatedTextState = remember {
mutableStateOf(ResultOrError(content, null, null, null))
@ -89,8 +87,7 @@ fun TranslatableRichTextViewer(
tags,
backgroundColor,
accountViewModel,
navController,
proxy
navController
)
val target = translatedTextState.value.targetLang