nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

restructures video and image views to avoid buttons getting on top of one another.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-06-06 18:39:39 -04:00
parent 673f632563
commit c94c882c3a
16 changed files with 691 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/MediaContentModels.kt
+5 -2
View File
@@ -38,6 +38,7 @@ abstract class MediaUrlContent(
dim: String? = null,
blurhash: String? = null,
val uri: String? = null,
val mimeType: String? = null,
) : BaseMediaContent(description, dim, blurhash)
@Immutable
@@ -49,7 +50,8 @@ class MediaUrlImage(
dim: String? = null,
uri: String? = null,
val contentWarning: String? = null,
) : MediaUrlContent(url, description, hash, dim, blurhash, uri)
mimeType: String? = null,
) : MediaUrlContent(url, description, hash, dim, blurhash, uri, mimeType)
@Immutable
class MediaUrlVideo(
@@ -62,7 +64,8 @@ class MediaUrlVideo(
val authorName: String? = null,
blurhash: String? = null,
val contentWarning: String? = null,
) : MediaUrlContent(url, description, hash, dim, blurhash, uri)
mimeType: String? = null,
) : MediaUrlContent(url, description, hash, dim, blurhash, uri, mimeType)
@Immutable
abstract class MediaPreloadedContent(
commons/src/main/java/com/vitorpamplona/amethyst/commons/richtext/RichTextParser.kt
+2
View File
@@ -61,6 +61,7 @@ class RichTextParser() {
dim = frags[FileHeaderEvent.DIMENSION] ?: tags[FileHeaderEvent.DIMENSION],
contentWarning = frags["content-warning"] ?: tags["content-warning"],
uri = callbackUri,
mimeType = frags[FileHeaderEvent.MIME_TYPE] ?: tags[FileHeaderEvent.MIME_TYPE],
)
} else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
val frags = Nip54InlineMetadata().parse(fullUrl)
@@ -73,6 +74,7 @@ class RichTextParser() {
dim = frags[FileHeaderEvent.DIMENSION] ?: tags[FileHeaderEvent.DIMENSION],
contentWarning = frags["content-warning"] ?: tags["content-warning"],
uri = callbackUri,
mimeType = frags[FileHeaderEvent.MIME_TYPE] ?: tags[FileHeaderEvent.MIME_TYPE],
)
} else {
null