highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 14:27:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1409 from davotoula/1406-display-app-picture-when-clicked-on-app-picture

Browse Source 
Display app picture when clicked on app picture
This commit is contained in:
Vitor Pamplona
2025-08-14 09:51:06 -04:00
committed by GitHub
parent f5881d4248 e682a95822
commit 6514bacf69
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/AppDefinition.kt
View File

@@ -91,16 +91,16 @@ fun RenderAppDefinition(
withContext(Dispatchers.Default) { metadata = noteEvent.appMetaData() }
}
metadata?.let {
metadata?.let { theAppMetadata ->
Box {
val clipboardManager = LocalClipboardManager.current
val uri = LocalUriHandler.current
if (!it.banner.isNullOrBlank()) {
if (!theAppMetadata.banner.isNullOrBlank()) {
var zoomImageDialogOpen by remember { mutableStateOf(false) }
AsyncImage(
model = it.banner,
model = theAppMetadata.banner,
contentDescription = stringRes(id = R.string.profile_image),
contentScale = ContentScale.FillWidth,
modifier =
@@ -109,13 +109,13 @@ fun RenderAppDefinition(
.height(125.dp)
.combinedClickable(
onClick = {},
onLongClick = { clipboardManager.setText(AnnotatedString(it.banner!!)) },
onLongClick = { clipboardManager.setText(AnnotatedString(theAppMetadata.banner!!)) },
),
)
if (zoomImageDialogOpen) {
ZoomableImageDialog(
imageUrl = RichTextParser.parseImageOrVideo(it.banner!!),
imageUrl = RichTextParser.parseImageOrVideo(theAppMetadata.banner!!),
onDismiss = { zoomImageDialogOpen = false },
accountViewModel = accountViewModel,
)
@@ -144,12 +144,11 @@ fun RenderAppDefinition(
verticalAlignment = Alignment.Bottom,
) {
var zoomImageDialogOpen by remember { mutableStateOf(false) }
Box(Modifier.size(100.dp)) {
it.picture?.let { picture ->
theAppMetadata.picture?.let { picture ->
AsyncImage(
model = picture,
contentDescription = it.name,
contentDescription = theAppMetadata.name,
contentScale = ContentScale.FillWidth,
modifier =
Modifier
@@ -165,15 +164,15 @@ fun RenderAppDefinition(
onLongClick = { clipboardManager.setText(AnnotatedString(picture)) },
),
)
}
}
if (zoomImageDialogOpen) {
ZoomableImageDialog(
imageUrl = RichTextParser.parseImageOrVideo(it.banner!!),
onDismiss = { zoomImageDialogOpen = false },
accountViewModel = accountViewModel,
)
if (zoomImageDialogOpen) {
ZoomableImageDialog(
imageUrl = RichTextParser.parseImageOrVideo(theAppMetadata.picture!!),
onDismiss = { zoomImageDialogOpen = false },
accountViewModel = accountViewModel,
)
}
}
}
Spacer(Modifier.weight(1f))
@@ -186,7 +185,7 @@ fun RenderAppDefinition(
) {}
}
val name = remember(it) { it.anyName() }
val name = remember(theAppMetadata) { theAppMetadata.anyName() }
name?.let {
Row(
verticalAlignment = Alignment.Bottom,
@@ -204,7 +203,7 @@ fun RenderAppDefinition(
}
}
val website = remember(it) { it.website }
val website = remember(theAppMetadata) { theAppMetadata.website }
if (!website.isNullOrEmpty()) {
Row(verticalAlignment = Alignment.CenterVertically) {
LinkIcon(Size16Modifier, MaterialTheme.colorScheme.placeholderText)
@@ -217,7 +216,7 @@ fun RenderAppDefinition(
}
}
it.about?.let {
theAppMetadata.about?.let {
Row(
modifier = Modifier.padding(top = 5.dp, bottom = 5.dp),
) {

4
quartz/src/main/java/com/vitorpamplona/quartz/nip89AppHandlers/definition/AppMetadata.kt
View File

@@ -113,8 +113,8 @@ class AppMetadata {
fun toJson() = assemble(this)
companion object {
fun assemble(data: AppMetadata) = JsonMapper.mapper.writeValueAsString(data)
fun assemble(data: AppMetadata): String = JsonMapper.mapper.writeValueAsString(data)
fun parse(content: String) = JsonMapper.mapper.readValue(content, AppMetadata::class.java)
fun parse(content: String): AppMetadata = JsonMapper.mapper.readValue(content, AppMetadata::class.java)
}
}