Skip to content

Commit 16b348a

Browse files
committed
Fix ordering of media.
1 parent 9bdd2cb commit 16b348a

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ class MediaItemsPostProcessor @Inject constructor() {
5454
when (item) {
5555
is MediaItem.Image,
5656
is MediaItem.Video -> {
57-
imageAndVideoItemsSubList.add(0, item)
57+
imageAndVideoItemsSubList.add(item)
5858
}
5959
is MediaItem.Audio,
6060
is MediaItem.Voice,
6161
is MediaItem.File -> {
62-
fileItemsSublist.add(0, item)
62+
fileItemsSublist.add(item)
6363
}
6464
}
6565
}

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ class MediaItemsPostProcessorTest {
8585
expectedImageAndVideoItems = emptyList(),
8686
expectedFileItems = listOf(
8787
date1,
88-
file1,
89-
file2,
90-
file3,
9188
audio1,
89+
file3,
90+
file2,
91+
file1,
9292
),
9393
)
9494
}
@@ -104,9 +104,9 @@ class MediaItemsPostProcessorTest {
104104
),
105105
expectedImageAndVideoItems = listOf(
106106
date1,
107-
image1,
108-
image2,
109107
image3,
108+
image2,
109+
image1,
110110
),
111111
expectedFileItems = emptyList(),
112112
)
@@ -124,13 +124,13 @@ class MediaItemsPostProcessorTest {
124124
),
125125
expectedImageAndVideoItems = listOf(
126126
date1,
127-
video1,
128127
image1,
128+
video1,
129129
),
130130
expectedFileItems = listOf(
131131
date1,
132-
file1,
133132
audio1,
133+
file1,
134134
),
135135
)
136136
}
@@ -167,6 +167,11 @@ class MediaItemsPostProcessorTest {
167167
fun `process will handle complex case`() {
168168
test(
169169
mediaItems = listOf(
170+
file3,
171+
date3,
172+
video3,
173+
video2,
174+
date2,
170175
voice3,
171176
voice2,
172177
voice1,
@@ -177,33 +182,28 @@ class MediaItemsPostProcessorTest {
177182
image1,
178183
video1,
179184
date1,
180-
file3,
181-
date3,
182-
video3,
183-
video2,
184-
date2,
185185
loading1,
186186
),
187187
expectedImageAndVideoItems = listOf(
188-
date1,
189-
video1,
190-
image1,
191188
date2,
192-
video2,
193189
video3,
190+
video2,
191+
date1,
192+
image1,
193+
video1,
194194
loading1,
195195
),
196196
expectedFileItems = listOf(
197-
date1,
198-
file1,
199-
audio1,
200-
audio2,
201-
audio3,
202-
voice1,
203-
voice2,
204-
voice3,
205197
date3,
206198
file3,
199+
date1,
200+
voice3,
201+
voice2,
202+
voice1,
203+
audio3,
204+
audio2,
205+
audio1,
206+
file1,
207207
loading1,
208208
),
209209
)

0 commit comments

Comments
 (0)