From 463ccf53effbe08c61fad27e5dd4ca0a985ae784 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 26 May 2018 16:38:17 +0900
Subject: [PATCH 1/4] fix png files not loading

---
 .../gramophone/glide/audiocover/AudioFileCoverFetcher.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
index e97cbc29..a8813a5c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
@@ -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();

From e0aaf0923286daaf4eca032e11cbcbcd81a82890 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sat, 26 May 2018 16:38:58 +0900
Subject: [PATCH 2/4] unknown year shown as zero in horizontal album adapter

---
 .../gramophone/adapter/album/HorizontalAlbumAdapter.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
index 911bca19..e2ed6b1b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
@@ -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

From 1127fc862df1259bcb59f8c306ce867a0ea7c518 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Tue, 5 Jun 2018 19:05:13 +0200
Subject: [PATCH 3/4] Fix indent

---
 .../gramophone/glide/audiocover/AudioFileCoverFetcher.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
index a8813a5c..a675a869 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/glide/audiocover/AudioFileCoverFetcher.java
@@ -45,8 +45,7 @@ public class AudioFileCoverFetcher implements DataFetcher<InputStream> {
         }
     }
 
-    private static final String[] FALLBACKS
-            = {"cover.jpg", "album.jpg", "folder.jpg", "cover.png", "album.png", "folder.png"};
+    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();

From a635ff45d60babee36a9fe9a07c9bcaa413a4f86 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Tue, 5 Jun 2018 19:16:14 +0200
Subject: [PATCH 4/4] Display an unknown album year consistently everywhere

---
 .../com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java | 2 +-
 .../gramophone/adapter/album/HorizontalAlbumAdapter.java     | 3 ++-
 .../com/kabouzeid/gramophone/adapter/song/SongAdapter.java   | 2 +-
 .../gramophone/ui/activities/AlbumDetailActivity.java        | 2 +-
 .../main/java/com/kabouzeid/gramophone/util/MusicUtil.java   | 5 +++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
index e4a7f33d..5a2bab70 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
@@ -198,7 +198,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
                 sectionName = dataSet.get(position).getArtistName();
                 break;
             case SortOrder.AlbumSortOrder.ALBUM_YEAR:
-                return Integer.toString(dataSet.get(position).getYear());
+                return MusicUtil.getYearString(dataSet.get(position).getYear());
         }
 
         return MusicUtil.getSectionName(sectionName);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
index e2ed6b1b..42a634a3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java
@@ -16,6 +16,7 @@ import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.helper.HorizontalAdapterHelper;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.model.Album;
+import com.kabouzeid.gramophone.util.MusicUtil;
 
 import java.util.ArrayList;
 
@@ -76,7 +77,7 @@ public class HorizontalAlbumAdapter extends AlbumAdapter {
 
     @Override
     protected String getAlbumText(Album album) {
-        return String.valueOf(album.getYear());
+        return MusicUtil.getYearString(album.getYear());
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
index 1faa6f07..af6878e0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
@@ -203,7 +203,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
                 sectionName = dataSet.get(position).artistName;
                 break;
             case SortOrder.SongSortOrder.SONG_YEAR:
-                return Integer.toString(dataSet.get(position).year);
+                return MusicUtil.getYearString(dataSet.get(position).year);
         }
 
         return MusicUtil.getSectionName(sectionName);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index 06c2b2e9..1ddffb81 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -418,7 +418,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
         artistTextView.setText(album.getArtistName());
         songCountTextView.setText(MusicUtil.getSongCountString(this, album.getSongCount()));
         durationTextView.setText(MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs)));
-        albumYearTextView.setText(album.getYear() > 0 ? String.valueOf(album.getYear()) : "-");
+        albumYearTextView.setText(MusicUtil.getYearString(album.getYear()));
 
         adapter.swapDataSet(album.songs);
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
index 23ddd8b0..97c46880 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
@@ -139,6 +139,11 @@ public class MusicUtil {
         return albumCount + " " + albumString;
     }
 
+    @NonNull
+    public static String getYearString(int year) {
+        return year > 0 ? String.valueOf(year) : "-";
+    }
+
     public static long getTotalDuration(@NonNull final Context context, @NonNull List<Song> songs) {
         long duration = 0;
         for (int i = 0; i < songs.size(); i++) {