From 527ce7ccdb0d901680b6f1a401865ebd3cb072bd Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sat, 26 Dec 2015 23:00:44 +0100
Subject: [PATCH] Fixed wrong multi select item titles

---
 .../com/kabouzeid/gramophone/adapter/PlaylistAdapter.java   | 5 +++++
 .../kabouzeid/gramophone/adapter/album/AlbumAdapter.java    | 5 +++++
 .../kabouzeid/gramophone/adapter/artist/ArtistAdapter.java  | 5 +++++
 .../gramophone/adapter/base/AbsMultiSelectAdapter.java      | 6 +++++-
 .../com/kabouzeid/gramophone/adapter/song/SongAdapter.java  | 5 +++++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index b470c14a..b465daf4 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -125,6 +125,11 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
         return dataSet.get(position);
     }
 
+    @Override
+    protected String getName(Playlist playlist) {
+        return playlist.name;
+    }
+
     @Override
     protected void onMultipleItemAction(@NonNull MenuItem menuItem, @NonNull ArrayList<Playlist> selection) {
         switch (menuItem.getItemId()) {
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 7d827f16..b0cdb538 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
@@ -175,6 +175,11 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
         return dataSet.get(position);
     }
 
+    @Override
+    protected String getName(Album album) {
+        return album.title;
+    }
+
     @Override
     protected void onMultipleItemAction(@NonNull MenuItem menuItem, @NonNull ArrayList<Album> selection) {
         switch (menuItem.getItemId()) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
index 8f5885f3..30f880b6 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
@@ -164,6 +164,11 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
         return dataSet.get(position);
     }
 
+    @Override
+    protected String getName(Artist artist) {
+        return artist.name;
+    }
+
     @Override
     protected void onMultipleItemAction(@NonNull MenuItem menuItem, @NonNull ArrayList<Artist> selection) {
         switch (menuItem.getItemId()) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/base/AbsMultiSelectAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/base/AbsMultiSelectAdapter.java
index f313c376..f7e15b8d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/base/AbsMultiSelectAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/base/AbsMultiSelectAdapter.java
@@ -45,7 +45,7 @@ public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder,
 
             final int size = checked.size();
             if (size <= 0) cab.finish();
-            else if (size == 1) cab.setTitle(checked.get(0).toString());
+            else if (size == 1) cab.setTitle(getName(checked.get(0)));
             else if (size > 1) cab.setTitle(context.getString(R.string.x_selected, size));
 
             return true;
@@ -93,6 +93,10 @@ public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder,
         return true;
     }
 
+    protected String getName(I object) {
+        return object.toString();
+    }
+
     protected abstract I getIdentifier(int position);
 
     protected abstract void onMultipleItemAction(MenuItem menuItem, ArrayList<I> selection);
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 f291ab7d..fe0bc22c 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
@@ -182,6 +182,11 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
         return dataSet.get(position);
     }
 
+    @Override
+    protected String getName(Song song) {
+        return song.title;
+    }
+
     @Override
     protected void onMultipleItemAction(@NonNull MenuItem menuItem, @NonNull ArrayList<Song> selection) {
         switch (menuItem.getItemId()) {