diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt index 52e62db27..541d98cba 100644 --- a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt +++ b/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt @@ -72,9 +72,11 @@ class RealAlbumRepository(private val songRepository: RealSongRepository) : // We don't need sorted list of songs (with sortAlbumSongs()) // cuz we are just displaying Albums(Cover Arts) anyway and not songs fun splitIntoAlbums( - songs: List + songs: List, + sorted: Boolean = true ): List { val grouped = songs.groupBy { it.albumId }.map { Album(it.key, it.value) } + if (!sorted) return grouped val collator = Collator.getInstance() return when (PreferenceUtil.albumSortOrder) { SortOrder.AlbumSortOrder.ALBUM_A_Z -> { diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt index 153eb3752..dae6854c7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt +++ b/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt @@ -42,7 +42,7 @@ class RealLastAddedRepository( } override fun recentAlbums(): List { - return albumRepository.splitIntoAlbums(recentSongs()) + return albumRepository.splitIntoAlbums(recentSongs(), sorted = false) } override fun recentArtists(): List { diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt index 810c401d5..1470f7fc3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt +++ b/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt @@ -81,7 +81,7 @@ class RealTopPlayedRepository( } override fun topAlbums(): List { - return albumRepository.splitIntoAlbums(topTracks()) + return albumRepository.splitIntoAlbums(topTracks(), sorted = false) } override fun topArtists(): List {