Skip to content

Improve the "Artist" sort order by secondarily sorting by year #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JuliusBrueggemann wants to merge 1 commit into
base: development
Choose a base branch
from
+8 −3
Open

Improve the "Artist" sort order by secondarily sorting by year #813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumCatalogueAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.function.Function;

public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAdapter.ViewHolder> implements Filterable, StandardViewTypeAdapter {
private final ClickCallback click;
Expand Down Expand Up @@ -164,10 +165,14 @@ public void sort(String order) {
));
break;
case Constants.ALBUM_ORDER_BY_ARTIST:
// If we call thenComparing() on the Comparator, the Java compiler seems unable
// to figure out that album is supposed to be an AlbumID3, so we explicitly assign
// the lambda to a variable so that we can specify the type.
Function<AlbumID3, String> getArtist = album -> album.getArtist() != null ? album.getArtist() : "";
albums.sort(Comparator.comparing(
album -> album.getArtist() != null ? album.getArtist() : "",
String.CASE_INSENSITIVE_ORDER
));
getArtist,
String.CASE_INSENSITIVE_ORDER
).thenComparing(AlbumID3::getYear));
break;
case Constants.ALBUM_ORDER_BY_YEAR:
albums.sort(Comparator.comparing(AlbumID3::getYear));
Expand Down