Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ordering of media.

Browse source
This commit is contained in:
Benoit Marty 2024-12-18 11:23:53 +01:00
parent 9bdd2cb11d
commit 16b348a2ce
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt
View file

@ -54,12 +54,12 @@ class MediaItemsPostProcessor @Inject constructor() {
when (item) {
is MediaItem.Image,
is MediaItem.Video -> {
imageAndVideoItemsSubList.add(0, item)
imageAndVideoItemsSubList.add(item)
}
is MediaItem.Audio,
is MediaItem.Voice,
is MediaItem.File -> {
fileItemsSublist.add(0, item)
fileItemsSublist.add(item)
}
}
}

48
libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt
View file

@ -85,10 +85,10 @@ class MediaItemsPostProcessorTest {
expectedImageAndVideoItems = emptyList(),
expectedFileItems = listOf(
date1,
file1,
file2,
file3,
audio1,
file3,
file2,
file1,
),
)
}
@ -104,9 +104,9 @@ class MediaItemsPostProcessorTest {
),
expectedImageAndVideoItems = listOf(
date1,
image1,
image2,
image3,
image2,
image1,
),
expectedFileItems = emptyList(),
)
@ -124,13 +124,13 @@ class MediaItemsPostProcessorTest {
),
expectedImageAndVideoItems = listOf(
date1,
video1,
image1,
video1,
),
expectedFileItems = listOf(
date1,
file1,
audio1,
file1,
),
)
}
@ -167,6 +167,11 @@ class MediaItemsPostProcessorTest {
fun `process will handle complex case`() {
test(
mediaItems = listOf(
file3,
date3,
video3,
video2,
date2,
voice3,
voice2,
voice1,
@ -177,33 +182,28 @@ class MediaItemsPostProcessorTest {
image1,
video1,
date1,
file3,
date3,
video3,
video2,
date2,
loading1,
),
expectedImageAndVideoItems = listOf(
date1,
video1,
image1,
date2,
video2,
video3,
video2,
date1,
image1,
video1,
loading1,
),
expectedFileItems = listOf(
date1,
file1,
audio1,
audio2,
audio3,
voice1,
voice2,
voice3,
date3,
file3,
date1,
voice3,
voice2,
voice1,
audio3,
audio2,
audio1,
file1,
loading1,
),
)