mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-10-11 10:52:44 +02:00
do not load preview of long form text if automaticallyShowUrlPreview is false
This commit is contained in:
@@ -85,6 +85,7 @@ import com.vitorpamplona.amethyst.model.Note
|
|||||||
import com.vitorpamplona.amethyst.model.User
|
import com.vitorpamplona.amethyst.model.User
|
||||||
import com.vitorpamplona.amethyst.model.UserMetadata
|
import com.vitorpamplona.amethyst.model.UserMetadata
|
||||||
import com.vitorpamplona.amethyst.service.OnlineChecker
|
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.ATag
|
||||||
import com.vitorpamplona.amethyst.service.model.AppDefinitionEvent
|
import com.vitorpamplona.amethyst.service.model.AppDefinitionEvent
|
||||||
import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
|
import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
|
||||||
@@ -3225,17 +3226,27 @@ private fun LongFormHeader(noteEvent: LongTextNoteEvent, note: Note, accountView
|
|||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
Column {
|
Column {
|
||||||
image?.let {
|
val settings = accountViewModel.account.settings
|
||||||
AsyncImage(
|
val isMobile = ConnectivityStatus.isOnMobileData.value
|
||||||
model = it,
|
|
||||||
contentDescription = stringResource(
|
val automaticallyShowUrlPreview = when (settings.automaticallyShowUrlPreview) {
|
||||||
R.string.preview_card_image_for,
|
true -> !isMobile
|
||||||
it
|
false -> false
|
||||||
),
|
else -> true
|
||||||
contentScale = ContentScale.FillWidth,
|
}
|
||||||
modifier = Modifier.fillMaxWidth()
|
if (automaticallyShowUrlPreview) {
|
||||||
)
|
image?.let {
|
||||||
} ?: CreateImageHeader(note, accountViewModel)
|
AsyncImage(
|
||||||
|
model = it,
|
||||||
|
contentDescription = stringResource(
|
||||||
|
R.string.preview_card_image_for,
|
||||||
|
it
|
||||||
|
),
|
||||||
|
contentScale = ContentScale.FillWidth,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
} ?: CreateImageHeader(note, accountViewModel)
|
||||||
|
}
|
||||||
|
|
||||||
title?.let {
|
title?.let {
|
||||||
Text(
|
Text(
|
||||||
|
Reference in New Issue
Block a user