Merge branch 'phonograph' of https://github.com/dkanada/VinylMusicPlayer into dkanada-phonograph

This commit is contained in:
Karim Abou Zeid 2018-06-05 19:01:48 +02:00
commit 3e574669dd
2 changed files with 3 additions and 6 deletions

View file

@ -76,11 +76,7 @@ public class HorizontalAlbumAdapter extends AlbumAdapter {
@Override
protected String getAlbumText(Album album) {
int year = album.getYear();
if(year > 0) {
return String.valueOf(year);
}
return "-";
return String.valueOf(album.getYear());
}
@Override

View file

@ -45,7 +45,8 @@ public class AudioFileCoverFetcher implements DataFetcher<InputStream> {
}
}
private static final String[] FALLBACKS = {"cover.jpg", "album.jpg", "folder.jpg"};
private static final String[] FALLBACKS
= {"cover.jpg", "album.jpg", "folder.jpg", "cover.png", "album.png", "folder.png"};
private InputStream fallback(String path) throws FileNotFoundException {
File parent = new File(path).getParentFile();