From b31d2d49d6a88bac235088227c12046145287b1c Mon Sep 17 00:00:00 2001 From: greenart7c3 <115044884+greenart7c3@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:46:25 -0300 Subject: [PATCH] do not load preview of long form text if automaticallyShowUrlPreview is false --- .../amethyst/ui/note/NoteCompose.kt | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 9e9595322..6de5da295 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -85,6 +85,7 @@ import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.User import com.vitorpamplona.amethyst.model.UserMetadata import com.vitorpamplona.amethyst.service.OnlineChecker +import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus import com.vitorpamplona.amethyst.service.model.ATag import com.vitorpamplona.amethyst.service.model.AppDefinitionEvent import com.vitorpamplona.amethyst.service.model.AudioTrackEvent @@ -3225,17 +3226,27 @@ private fun LongFormHeader(noteEvent: LongTextNoteEvent, note: Note, accountView ) ) { Column { - image?.let { - AsyncImage( - model = it, - contentDescription = stringResource( - R.string.preview_card_image_for, - it - ), - contentScale = ContentScale.FillWidth, - modifier = Modifier.fillMaxWidth() - ) - } ?: CreateImageHeader(note, accountViewModel) + val settings = accountViewModel.account.settings + val isMobile = ConnectivityStatus.isOnMobileData.value + + val automaticallyShowUrlPreview = when (settings.automaticallyShowUrlPreview) { + true -> !isMobile + false -> false + else -> true + } + if (automaticallyShowUrlPreview) { + image?.let { + AsyncImage( + model = it, + contentDescription = stringResource( + R.string.preview_card_image_for, + it + ), + contentScale = ContentScale.FillWidth, + modifier = Modifier.fillMaxWidth() + ) + } ?: CreateImageHeader(note, accountViewModel) + } title?.let { Text(