From e1f39005b6e265e5b3bd6b487f2db2ae1e66500e Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Thu, 9 Jun 2022 15:40:36 +0200 Subject: [PATCH] Specify contentType in LazyLists --- .../kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt | 8 ++++++-- .../it/vfsfitvnm/vimusic/ui/screens/IntentUriScreen.kt | 5 ++++- .../vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt | 7 +++++-- .../it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt | 5 ++++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt index b0dd759..d299e08 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt @@ -262,7 +262,10 @@ fun HomeScreen( } } - items(playlistPreviews) { playlistPreview -> + items( + items = playlistPreviews, + contentType = { it } + ) { playlistPreview -> PlaylistPreviewItem( playlistPreview = playlistPreview, modifier = Modifier @@ -391,7 +394,8 @@ fun HomeScreen( items = songCollection, key = { _, song -> song.song.id - } + }, + contentType = { _, song -> song } ) { index, song -> SongItem( song = song, diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/IntentUriScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/IntentUriScreen.kt index b2841b1..d93d173 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/IntentUriScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/IntentUriScreen.kt @@ -231,7 +231,10 @@ fun IntentUriScreen(uri: Uri) { ) } } else { - itemsIndexed(currentItems.value) { index, item -> + itemsIndexed( + items = currentItems.value, + contentType = { _, item -> item } + ) { index, item -> SmallSongItem( song = item, thumbnailSizePx = density.run { 54.dp.roundToPx() }, diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt index cc3943a..37d02c9 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt @@ -273,8 +273,11 @@ fun LocalPlaylistScreen( } } - - itemsIndexed(items = playlistWithSongs.songs, key = { _, song -> song.song.id }) { index, song -> + itemsIndexed( + items = playlistWithSongs.songs, + key = { _, song -> song.song.id }, + contentType = { _, song -> song }, + ) { index, song -> SongItem( song = song, thumbnailSize = thumbnailSize, diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt index 13aec5b..ff9a2bd 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SearchResultScreen.kt @@ -199,7 +199,10 @@ fun SearchResultScreen( ) } - items(items) { item -> + items( + items = items, + contentType = { it } + ) { item -> SmallItem( item = item, thumbnailSizeDp = 54.dp,