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

- Adds support for AVIF images

Browse Source 
- Removes gray border in image urls that couldn't be loaded.
This commit is contained in:
Vitor Pamplona
2024-06-11 10:25:11 -04:00
parent 3a63c1d1ab
commit bd6202f8e1
6 changed files with 62 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt
+1 -1
View File
@@ -34,7 +34,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
val SUPPORTED_VIDEO_FEED_MIME_TYPES = listOf("image/jpeg", "image/gif", "image/png", "image/webp", "video/mp4", "video/mpeg", "video/webm", "audio/aac", "audio/mpeg", "audio/webm", "audio/wav")
val SUPPORTED_VIDEO_FEED_MIME_TYPES = listOf("image/jpeg", "image/gif", "image/png", "image/webp", "video/mp4", "video/mpeg", "video/webm", "audio/aac", "audio/mpeg", "audio/webm", "audio/wav", "image/avif")
val SUPPORTED_VIDEO_FEED_MIME_TYPES_SET = SUPPORTED_VIDEO_FEED_MIME_TYPES.toSet()
object NostrVideoDataSource : NostrDataSource("VideoFeed") {
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt
+2
View File
@@ -402,6 +402,7 @@ private fun RenderImageOrVideo(
UrlImageView(
content = content,
mainImageModifier = mainModifier,
loadedImageModifier = Modifier.fillMaxWidth(),
isFiniteHeight = isFiniteHeight,
controllerVisible = controllerVisible,
accountViewModel = accountViewModel,
@@ -436,6 +437,7 @@ private fun RenderImageOrVideo(
LocalImageView(
content = content,
mainImageModifier = mainModifier,
loadedImageModifier = Modifier.fillMaxWidth(),
isFiniteHeight = isFiniteHeight,
controllerVisible = controllerVisible,
accountViewModel = accountViewModel,
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
+16 -32
View File
@@ -117,32 +117,14 @@ fun ZoomableContentView(
// store the dialog open or close state
var dialogOpen by remember(content) { mutableStateOf(false) }
var mainImageModifier =
if (roundedCorner) {
MaterialTheme.colorScheme.imageModifier
} else {
Modifier.fillMaxWidth()
}
if (content is MediaUrlContent) {
mainImageModifier =
mainImageModifier.clickable(
onClick = { dialogOpen = true },
)
} else if (content is MediaPreloadedContent) {
mainImageModifier =
mainImageModifier.clickable(
onClick = { dialogOpen = true },
)
} else {
mainImageModifier = mainImageModifier.clickable { dialogOpen = true }
}
val mainImageModifier = Modifier.fillMaxWidth().clickable { dialogOpen = true }
val loadedImageModifier = if (roundedCorner) MaterialTheme.colorScheme.imageModifier else Modifier.fillMaxWidth()
when (content) {
is MediaUrlImage ->
SensitivityWarning(content.contentWarning != null, accountViewModel) {
TwoSecondController(content) { controllerVisible ->
UrlImageView(content, mainImageModifier, isFiniteHeight, controllerVisible, accountViewModel = accountViewModel)
UrlImageView(content, mainImageModifier, loadedImageModifier, isFiniteHeight, controllerVisible, accountViewModel = accountViewModel)
}
}
is MediaUrlVideo ->
@@ -166,7 +148,7 @@ fun ZoomableContentView(
}
is MediaLocalImage ->
TwoSecondController(content) { controllerVisible ->
LocalImageView(content, mainImageModifier, isFiniteHeight, controllerVisible, accountViewModel = accountViewModel)
LocalImageView(content, mainImageModifier, loadedImageModifier, isFiniteHeight, controllerVisible, accountViewModel = accountViewModel)
}
is MediaLocalVideo ->
content.localFile?.let {
@@ -215,6 +197,7 @@ fun TwoSecondController(
fun LocalImageView(
content: MediaLocalImage,
mainImageModifier: Modifier,
loadedImageModifier: Modifier,
isFiniteHeight: Boolean,
controllerVisible: MutableState<Boolean>,
accountViewModel: AccountViewModel,
@@ -252,14 +235,14 @@ fun LocalImageView(
content.blurhash,
content.description,
contentScale,
Modifier.aspectRatio(ratio),
loadedImageModifier.aspectRatio(ratio),
)
} else {
DisplayBlurHash(
content.blurhash,
content.description,
contentScale,
Modifier,
loadedImageModifier,
)
}
} else {
@@ -267,10 +250,10 @@ fun LocalImageView(
}
}
is AsyncImagePainter.State.Error -> {
BlankNote()
BlankNote(loadedImageModifier)
}
is AsyncImagePainter.State.Success -> {
SubcomposeAsyncImageContent()
SubcomposeAsyncImageContent(loadedImageModifier)
content.isVerified?.let {
AnimatedVisibility(
@@ -294,7 +277,7 @@ fun LocalImageView(
content.blurhash,
content.description,
ContentScale.Crop,
mainImageModifier
loadedImageModifier
.aspectRatio(ratio)
.clickable { showImage.value = true },
)
@@ -310,7 +293,7 @@ fun LocalImageView(
}
}
} else {
BlankNote()
BlankNote(loadedImageModifier)
}
}
@@ -318,6 +301,7 @@ fun LocalImageView(
fun UrlImageView(
content: MediaUrlImage,
mainImageModifier: Modifier,
loadedImageModifier: Modifier,
isFiniteHeight: Boolean,
controllerVisible: MutableState<Boolean>,
accountViewModel: AccountViewModel,
@@ -351,14 +335,14 @@ fun UrlImageView(
content.blurhash,
content.description,
ContentScale.Crop,
Modifier.aspectRatio(ratio),
loadedImageModifier.aspectRatio(ratio),
)
} else {
DisplayBlurHash(
content.blurhash,
content.description,
ContentScale.Crop,
Modifier,
loadedImageModifier,
)
}
} else {
@@ -369,7 +353,7 @@ fun UrlImageView(
ClickableUrl(urlText = "${content.url} ", url = content.url)
}
is AsyncImagePainter.State.Success -> {
SubcomposeAsyncImageContent()
SubcomposeAsyncImageContent(loadedImageModifier)
AnimatedVisibility(
visible = controllerVisible.value,
@@ -391,7 +375,7 @@ fun UrlImageView(
content.blurhash,
content.description,
ContentScale.Crop,
mainImageModifier
loadedImageModifier
.aspectRatio(ratio)
.clickable { showImage.value = true },
)