image: fix album ordering

Prior ordering sorted by album song count, which skewed results if an
entire album was not present in an input list.
This commit is contained in:
Alexander Capehart 2023-05-21 14:45:45 -06:00
parent 877d380fa0
commit 9b37975008
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 3 additions and 3 deletions

View file

@ -50,7 +50,6 @@ import okio.buffer
import okio.source
import org.oxycblt.auxio.image.CoverMode
import org.oxycblt.auxio.image.ImageSettings
import org.oxycblt.auxio.list.Sort
import org.oxycblt.auxio.music.Album
import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.util.logD
@ -81,8 +80,8 @@ constructor(
}
}
fun computeAlbumOrdering(songs: List<Song>): Collection<Album> =
Sort(Sort.Mode.ByCount, Sort.Direction.DESCENDING).albums(songs.groupBy { it.album }.keys)
fun computeAlbumOrdering(songs: List<Song>) =
songs.groupBy { it.album }.entries.sortedByDescending { it.value.size }.map { it.key }
private suspend fun openInputStream(album: Album): InputStream? =
try {

View file

@ -52,6 +52,7 @@ class RenamePlaylistDialog : ViewBindingDialogFragment<DialogPlaylistNameBinding
override fun onConfigDialog(builder: AlertDialog.Builder) {
builder
// TODO:
.setTitle(R.string.lbl_rename)
.setPositiveButton(R.string.lbl_ok) { _, _ ->
val playlist = unlikelyToBeNull(pickerModel.currentPlaylistToRename.value)