highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-07-15 00:42:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refining layout of URL Previews

Browse Source
This commit is contained in:
Vitor Pamplona
2023-11-05 11:27:30 -05:00
parent 6fa36255b2
commit 0a5e84fd3c
4 changed files with 51 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ import com.vitorpamplona.amethyst.service.startsWithNIP19Scheme
import com.vitorpamplona.amethyst.ui.components.BechLink import com.vitorpamplona.amethyst.ui.components.BechLink
import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
import com.vitorpamplona.amethyst.ui.components.InvoiceRequest import com.vitorpamplona.amethyst.ui.components.InvoiceRequest
import com.vitorpamplona.amethyst.ui.components.UrlPreview import com.vitorpamplona.amethyst.ui.components.LoadUrlPreview
import com.vitorpamplona.amethyst.ui.components.VideoView import com.vitorpamplona.amethyst.ui.components.VideoView
import com.vitorpamplona.amethyst.ui.components.ZapRaiserRequest import com.vitorpamplona.amethyst.ui.components.ZapRaiserRequest
import com.vitorpamplona.amethyst.ui.components.imageExtensions import com.vitorpamplona.amethyst.ui.components.imageExtensions
@ -465,7 +465,7 @@ fun NewPostView(
} else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) { } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
VideoView(myUrlPreview, roundedCorner = true, accountViewModel = accountViewModel) VideoView(myUrlPreview, roundedCorner = true, accountViewModel = accountViewModel)
} else { } else {
UrlPreview(myUrlPreview, myUrlPreview, accountViewModel) LoadUrlPreview(myUrlPreview, myUrlPreview, accountViewModel)
} }
} else if (startsWithNIP19Scheme(myUrlPreview)) { } else if (startsWithNIP19Scheme(myUrlPreview)) {
val bgColor = MaterialTheme.colorScheme.background val bgColor = MaterialTheme.colorScheme.background
@ -481,7 +481,7 @@ fun NewPostView(
nav nav
) )
} else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) { } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
UrlPreview("https://$myUrlPreview", myUrlPreview, accountViewModel) LoadUrlPreview("https://$myUrlPreview", myUrlPreview, accountViewModel)
} }
} }
} }

7
app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreview.kt → app/src/main/java/com/vitorpamplona/amethyst/ui/components/LoadUrlPreview.kt
View File

@ -12,7 +12,7 @@ import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@Composable @Composable
fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel) { fun LoadUrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel) {
val automaticallyShowUrlPreview = remember { val automaticallyShowUrlPreview = remember {
accountViewModel.settings.showUrlPreview.value accountViewModel.settings.showUrlPreview.value
} }
@ -37,11 +37,12 @@ fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel)
Crossfade( Crossfade(
targetState = urlPreviewState, targetState = urlPreviewState,
animationSpec = tween(durationMillis = 100) animationSpec = tween(durationMillis = 100),
label = "UrlPreview"
) { state -> ) { state ->
when (state) { when (state) {
is UrlPreviewState.Loaded -> { is UrlPreviewState.Loaded -> {
UrlPreviewCard(url, state.previewInfo, accountViewModel) UrlPreviewCard(url, state.previewInfo)
} }
else -> { else -> {

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

@ -278,7 +278,7 @@ private fun RenderWordWithPreview(
) { ) {
when (word) { when (word) {
is ImageSegment -> ZoomableContentView(word.segmentText, state, accountViewModel) is ImageSegment -> ZoomableContentView(word.segmentText, state, accountViewModel)
is LinkSegment -> UrlPreview(word.segmentText, word.segmentText, accountViewModel) is LinkSegment -> LoadUrlPreview(word.segmentText, word.segmentText, accountViewModel)
is EmojiSegment -> RenderCustomEmoji(word.segmentText, state) is EmojiSegment -> RenderCustomEmoji(word.segmentText, state)
is InvoiceSegment -> MayBeInvoicePreview(word.segmentText) is InvoiceSegment -> MayBeInvoicePreview(word.segmentText)
is WithdrawSegment -> MayBeWithdrawal(word.segmentText) is WithdrawSegment -> MayBeWithdrawal(word.segmentText)

18
app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt
View File

@ -2,13 +2,11 @@ package com.vitorpamplona.amethyst.ui.components
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
@ -18,7 +16,6 @@ import androidx.compose.ui.text.style.TextOverflow
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.service.previews.UrlInfoItem import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
import com.vitorpamplona.amethyst.ui.theme.MaxWidthWithHorzPadding import com.vitorpamplona.amethyst.ui.theme.MaxWidthWithHorzPadding
import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
@ -27,25 +24,16 @@ import com.vitorpamplona.amethyst.ui.theme.innerPostModifier
@Composable @Composable
fun UrlPreviewCard( fun UrlPreviewCard(
url: String, url: String,
previewInfo: UrlInfoItem, previewInfo: UrlInfoItem
accountViewModel: AccountViewModel
) { ) {
val automaticallyShowUrlPreview = remember {
accountViewModel.settings.showUrlPreview.value
}
if (!automaticallyShowUrlPreview) {
ClickableUrl(url, url)
} else {
val uri = LocalUriHandler.current val uri = LocalUriHandler.current
Row( Column(
modifier = MaterialTheme.colorScheme.innerPostModifier modifier = MaterialTheme.colorScheme.innerPostModifier
.clickable { .clickable {
runCatching { uri.openUri(url) } runCatching { uri.openUri(url) }
} }
) { ) {
Column {
AsyncImage( AsyncImage(
model = previewInfo.imageUrlFullPath, model = previewInfo.imageUrlFullPath,
contentDescription = stringResource(R.string.preview_card_image_for, previewInfo.url), contentDescription = stringResource(R.string.preview_card_image_for, previewInfo.url),
@ -84,5 +72,3 @@ fun UrlPreviewCard(
Spacer(modifier = DoubleVertSpacer) Spacer(modifier = DoubleVertSpacer)
} }
} }
}
}