From e30dbebc24480a1fe3304d21b69170bbee988667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Mon, 10 Apr 2017 02:06:52 +0200 Subject: [PATCH] Show album year when listing albums of an artist The year is important to play albums in chronological order and to put them into context. --- .../com/naman14/timber/adapters/ArtistAlbumAdapter.java | 7 ++++++- app/src/main/java/com/naman14/timber/models/Album.java | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/naman14/timber/adapters/ArtistAlbumAdapter.java b/app/src/main/java/com/naman14/timber/adapters/ArtistAlbumAdapter.java index 0cfccf2ef..884627ffc 100644 --- a/app/src/main/java/com/naman14/timber/adapters/ArtistAlbumAdapter.java +++ b/app/src/main/java/com/naman14/timber/adapters/ArtistAlbumAdapter.java @@ -58,7 +58,12 @@ public void onBindViewHolder(ItemHolder itemHolder, int i) { itemHolder.title.setText(localItem.title); String songCount = TimberUtils.makeLabel(mContext, R.plurals.Nsongs, localItem.songCount); - itemHolder.details.setText(songCount); + String albumYear = Integer.toString(localItem.year); + + if (localItem.hasYear()) + itemHolder.details.setText(albumYear + " - " + songCount); + else + itemHolder.details.setText(songCount); ImageLoader.getInstance().displayImage(TimberUtils.getAlbumArtUri(localItem.id).toString(), itemHolder.albumArt, new DisplayImageOptions.Builder().cacheInMemory(true) diff --git a/app/src/main/java/com/naman14/timber/models/Album.java b/app/src/main/java/com/naman14/timber/models/Album.java index d6d83fe24..88de3a231 100644 --- a/app/src/main/java/com/naman14/timber/models/Album.java +++ b/app/src/main/java/com/naman14/timber/models/Album.java @@ -15,6 +15,8 @@ package com.naman14.timber.models; public class Album { + public static final int YEAR_UNDEFINED = 0; + public final long artistId; public final String artistName; public final long id; @@ -41,4 +43,7 @@ public Album(long _id, String _title, String _artistName, long _artistId, int _s } + public boolean hasYear() { + return year != Album.YEAR_UNDEFINED; + } }