ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better fix to render all items in the gallery. Should be able to render mixed items.

Browse Source
This commit is contained in:
Benoit Marty
2026-06-26 16:21:16 +02:00
committed by Benoit Marty
parent e282212270
commit a7e6d8af6e
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/GalleryMediaGalleryDataSource.kt
+2 -4
View File
@@ -85,10 +85,8 @@ class GalleryMediaGalleryDataSource(
thumbnailSource = galleryItem.thumbnailSource,
)
}
when (mediaItem) {
is MediaItem.Image, is MediaItem.Video -> imageAndVideoItems.add(mediaItem)
is MediaItem.Audio, is MediaItem.File, is MediaItem.Voice -> fileItems.add(mediaItem)
}
// Add all items to imageAndVideoItems (we can have mixed attachments)
imageAndVideoItems.add(mediaItem)
}
return GalleryMediaGalleryDataSource(
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt
+1
View File
@@ -64,6 +64,7 @@ class MediaViewerDataSource(
private val galleryMode = when (mode) {
is MediaViewerMode.TimelineImagesAndVideos -> MediaGalleryMode.Images
is MediaViewerMode.TimelineFilesAndAudios -> MediaGalleryMode.Files
MediaViewerMode.EventGallery -> MediaGalleryMode.Images
}
// Map of sourceUrl to local media state
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
+5 -6
View File
@@ -116,6 +116,8 @@ class MediaViewerNode(
)
}
Timeline.Mode.Media -> timelineMediaGalleryDataSource
// null should not happen, input should be MediaViewerEntryPoint.Params.EventGallery in this case
null -> timelineMediaGalleryDataSource
}
}
}
@@ -129,11 +131,7 @@ class MediaViewerNode(
is MediaViewerEntryPoint.Params.Avatar ->
MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(Timeline.Mode.Media)
is MediaViewerEntryPoint.Params.EventGallery ->
if (inputs.galleryInfo.isAttachment) {
MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios(Timeline.Mode.Media)
} else {
MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(Timeline.Mode.Media)
}
MediaViewerEntryPoint.MediaViewerMode.EventGallery
is MediaViewerEntryPoint.Params.RoomMedia ->
inputs.mode
},
@@ -167,9 +165,10 @@ class MediaViewerNode(
}
}
internal fun MediaViewerEntryPoint.MediaViewerMode.getTimelineMode(): Timeline.Mode {
internal fun MediaViewerEntryPoint.MediaViewerMode.getTimelineMode(): Timeline.Mode? {
return when (this) {
is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> timelineMode
is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> timelineMode
MediaViewerEntryPoint.MediaViewerMode.EventGallery -> null
}
}
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
+2
View File
@@ -240,6 +240,8 @@ class MediaViewerPresenter(
val messageResId = when (inputs.mode) {
is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> R.string.screen_media_details_no_more_media_to_show
is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> R.string.screen_media_details_no_more_files_to_show
// Should not happen
MediaViewerEntryPoint.MediaViewerMode.EventGallery -> R.string.screen_media_details_no_more_media_to_show
}
val message = SnackbarMessage(messageResId)
snackbarDispatcher.post(message)