From 271cc713ae19f4acbb157f377e7d90780ebd17a7 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 27 Jan 2014 15:51:03 -0800 Subject: Add year to album header --- .../daneren2005/dsub/fragments/SelectDirectoryFragment.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index 7ab81dd0..65aeeb59 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -951,6 +951,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter int songCount = 0; Set artists = new HashSet(); + Set years = new HashSet(); Integer totalDuration = 0; for (MusicDirectory.Entry entry : entries) { if (!entry.isDirectory()) { @@ -958,6 +959,9 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter if (entry.getArtist() != null) { artists.add(entry.getArtist()); } + if(entry.getYear() != null) { + years.add(entry.getYear()); + } Integer duration = entry.getDuration(); if(duration != null) { totalDuration += duration; @@ -971,7 +975,11 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter artistView.setSingleLine(false); artistView.setLines(5); } else if (artists.size() == 1) { - artistView.setText(artists.iterator().next()); + String artistText = artists.iterator().next(); + if(years.size() == 1) { + artistText += " - " + years.iterator().next(); + } + artistView.setText(artistText); artistView.setVisibility(View.VISIBLE); } else { artistView.setVisibility(View.GONE); -- cgit v1.2.3