From 3bc0059989e967fb9861e4ced8be3ff0b7576df9 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 21 Jun 2015 13:27:25 +0200
Subject: [PATCH] Clean ups

---
 .../gramophone/adapter/PlaylistAdapter.java   |  8 +++-
 .../songadapter/AbsPlaylistSongAdapter.java   |  8 +---
 .../songadapter/PlaylistSongAdapter.java      |  2 -
 .../CannotDeleteSingleSongsSongAdapter.java   | 41 +++++++++++++++++++
 .../smartplaylist/LastAddedSongAdapter.java   | 28 -------------
 .../SmartPlaylistSongAdapter.java             |  2 +-
 .../helper/MenuItemClickHelper.java           |  2 +-
 .../gramophone/model/LastAddedPlaylist.java   | 23 -----------
 .../smartplaylist/LastAddedPlaylist.java      | 39 ++++++++++++++++++
 .../smartplaylist/MyTopTracksPlaylist.java    | 40 ++++++++++++++++++
 .../smartplaylist/RecentlyPlayedPlaylist.java | 40 ++++++++++++++++++
 .../{ => smartplaylist}/SmartPlaylist.java    | 12 +++++-
 .../SmartPlaylistDetailActivity.java          |  7 ++--
 .../gramophone/util/NavigationUtil.java       |  2 +-
 .../main/res/layout/artist_detail_header.xml  |  1 -
 .../res/layout/item_grid_artist_album.xml     | 11 +++--
 .../main/res/layout/item_list_playlist.xml    |  2 -
 .../res/layout/item_list_smart_playlist.xml   |  2 +
 ...single_songs_playlist_songs_selection.xml} |  0
 ...not_delete_single_songs_playlist_song.xml} |  0
 .../main/res/menu/menu_playlist_detail.xml    |  8 ++--
 app/src/main/res/values/styles_parents.xml    |  2 +-
 22 files changed, 197 insertions(+), 83 deletions(-)
 create mode 100644 app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/CannotDeleteSingleSongsSongAdapter.java
 delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/LastAddedSongAdapter.java
 delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/model/LastAddedPlaylist.java
 create mode 100644 app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
 create mode 100644 app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
 create mode 100644 app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/RecentlyPlayedPlaylist.java
 rename app/src/main/java/com/kabouzeid/gramophone/model/{ => smartplaylist}/SmartPlaylist.java (68%)
 rename app/src/main/res/menu/{menu_last_added_playlist_songs_selection.xml => menu_cannot_delete_single_songs_playlist_songs_selection.xml} (100%)
 rename app/src/main/res/menu/{menu_item_last_added_playlist_song.xml => menu_item_cannot_delete_single_songs_playlist_song.xml} (100%)

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 b9342b0d..86c99e20 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -22,10 +22,12 @@ import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.loader.PlaylistLoader;
 import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
 import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
-import com.kabouzeid.gramophone.model.LastAddedPlaylist;
 import com.kabouzeid.gramophone.model.Playlist;
-import com.kabouzeid.gramophone.model.SmartPlaylist;
 import com.kabouzeid.gramophone.model.Song;
+import com.kabouzeid.gramophone.model.smartplaylist.LastAddedPlaylist;
+import com.kabouzeid.gramophone.model.smartplaylist.MyTopTracksPlaylist;
+import com.kabouzeid.gramophone.model.smartplaylist.RecentlyPlayedPlaylist;
+import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.squareup.otto.Subscribe;
@@ -58,6 +60,8 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
     public void loadDataSet() {
         dataSet = new ArrayList<>();
         dataSet.add(new LastAddedPlaylist(activity));
+        dataSet.add(new RecentlyPlayedPlaylist(activity));
+        dataSet.add(new MyTopTracksPlaylist(activity));
         dataSet.addAll(PlaylistLoader.getAllPlaylists(activity));
     }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java
index f6796659..3dcab79f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java
@@ -136,13 +136,9 @@ public abstract class AbsPlaylistSongAdapter<S extends Song> extends AbsMultiSel
         return MenuItemClickHelper.handleSongMenuClick(activity, dataSet.get(adapterPosition), item);
     }
 
-    protected void onDeleteFromPlaylist(S song) {
+    protected abstract void onDeleteFromPlaylist(S song);
 
-    }
-
-    protected void onDeleteFromPlaylist(ArrayList<S> songs) {
-
-    }
+    protected abstract void onDeleteFromPlaylist(ArrayList<S> songs);
 
     protected void onAddToPlaylist(ArrayList<S> songs) {
         //noinspection unchecked
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java
index 3406f289..3a447e58 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java
@@ -20,13 +20,11 @@ public class PlaylistSongAdapter extends AbsPlaylistSongAdapter<PlaylistSong> {
 
     @Override
     protected void onDeleteFromPlaylist(ArrayList<PlaylistSong> songs) {
-        super.onDeleteFromPlaylist(songs);
         RemoveFromPlaylistDialog.create(songs).show(activity.getSupportFragmentManager(), "ADD_PLAYLIST");
     }
 
     @Override
     protected void onDeleteFromPlaylist(PlaylistSong song) {
-        super.onDeleteFromPlaylist(song);
         RemoveFromPlaylistDialog.create(song).show(activity.getSupportFragmentManager(), "ADD_PLAYLIST");
     }
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/CannotDeleteSingleSongsSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/CannotDeleteSingleSongsSongAdapter.java
new file mode 100644
index 00000000..3d10d266
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/CannotDeleteSingleSongsSongAdapter.java
@@ -0,0 +1,41 @@
+package com.kabouzeid.gramophone.adapter.songadapter.smartplaylist;
+
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.kabouzeid.gramophone.R;
+import com.kabouzeid.gramophone.interfaces.CabHolder;
+import com.kabouzeid.gramophone.model.Song;
+import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
+
+import java.util.ArrayList;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class CannotDeleteSingleSongsSongAdapter extends SmartPlaylistSongAdapter {
+
+    public CannotDeleteSingleSongsSongAdapter(AppCompatActivity activity, SmartPlaylist smartPlaylist, @Nullable CabHolder cabHolder) {
+        super(activity, smartPlaylist, cabHolder);
+    }
+
+    @Override
+    protected int getMultiSelectMenuRes() {
+        return R.menu.menu_cannot_delete_single_songs_playlist_songs_selection;
+    }
+
+    @Override
+    protected int getSongMenuRes() {
+        return R.menu.menu_item_cannot_delete_single_songs_playlist_song;
+    }
+
+    @Override
+    protected void onDeleteFromPlaylist(Song song) {
+        // you cannot delete single songs from this playlist
+    }
+
+    @Override
+    protected void onDeleteFromPlaylist(ArrayList<Song> songs) {
+        // you cannot delete single songs from this playlist
+    }
+}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/LastAddedSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/LastAddedSongAdapter.java
deleted file mode 100644
index b1d70c5d..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/LastAddedSongAdapter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.kabouzeid.gramophone.adapter.songadapter.smartplaylist;
-
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-
-import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.interfaces.CabHolder;
-import com.kabouzeid.gramophone.model.LastAddedPlaylist;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-public class LastAddedSongAdapter extends SmartPlaylistSongAdapter {
-
-    public LastAddedSongAdapter(AppCompatActivity activity, @Nullable CabHolder cabHolder) {
-        super(activity, new LastAddedPlaylist(activity), cabHolder);
-    }
-
-    @Override
-    protected int getMultiSelectMenuRes() {
-        return R.menu.menu_last_added_playlist_songs_selection;
-    }
-
-    @Override
-    protected int getSongMenuRes() {
-        return R.menu.menu_item_last_added_playlist_song;
-    }
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/SmartPlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/SmartPlaylistSongAdapter.java
index 1c307917..93b22ef7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/SmartPlaylistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/smartplaylist/SmartPlaylistSongAdapter.java
@@ -5,8 +5,8 @@ import android.support.v7.app.AppCompatActivity;
 
 import com.kabouzeid.gramophone.adapter.songadapter.AbsPlaylistSongAdapter;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
-import com.kabouzeid.gramophone.model.SmartPlaylist;
 import com.kabouzeid.gramophone.model.Song;
+import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
index 2cdd0489..681dc5be 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/MenuItemClickHelper.java
@@ -17,8 +17,8 @@ import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
 import com.kabouzeid.gramophone.loader.SongFilePathLoader;
 import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.model.Playlist;
-import com.kabouzeid.gramophone.model.SmartPlaylist;
 import com.kabouzeid.gramophone.model.Song;
+import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
 import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity;
 import com.kabouzeid.gramophone.util.MusicUtil;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/LastAddedPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/LastAddedPlaylist.java
deleted file mode 100644
index 851408af..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/model/LastAddedPlaylist.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.kabouzeid.gramophone.model;
-
-import android.content.Context;
-
-import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.loader.LastAddedLoader;
-
-import java.util.ArrayList;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-public class LastAddedPlaylist extends SmartPlaylist {
-
-    public LastAddedPlaylist(Context context) {
-        super(context.getString(R.string.last_added), R.drawable.ic_queue_white_24dp);
-    }
-
-    @Override
-    public ArrayList<Song> getSongs(Context context) {
-        return LastAddedLoader.getLastAddedSongs(context);
-    }
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
new file mode 100644
index 00000000..7e7121ee
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java
@@ -0,0 +1,39 @@
+package com.kabouzeid.gramophone.model.smartplaylist;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.kabouzeid.gramophone.R;
+import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.CannotDeleteSingleSongsSongAdapter;
+import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.SmartPlaylistSongAdapter;
+import com.kabouzeid.gramophone.interfaces.CabHolder;
+import com.kabouzeid.gramophone.loader.LastAddedLoader;
+import com.kabouzeid.gramophone.model.Song;
+
+import java.util.ArrayList;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class LastAddedPlaylist extends SmartPlaylist {
+
+    public LastAddedPlaylist(Context context) {
+        super(context.getString(R.string.last_added), R.drawable.ic_queue_white_24dp);
+    }
+
+    @Override
+    public ArrayList<Song> getSongs(Context context) {
+        return LastAddedLoader.getLastAddedSongs(context);
+    }
+
+    @Override
+    public SmartPlaylistSongAdapter createAdapter(AppCompatActivity activity, @Nullable CabHolder cabHolder) {
+        return new CannotDeleteSingleSongsSongAdapter(activity, this, cabHolder);
+    }
+
+    @Override
+    public void clear(Context context) {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
new file mode 100644
index 00000000..beb167b5
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java
@@ -0,0 +1,40 @@
+package com.kabouzeid.gramophone.model.smartplaylist;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.kabouzeid.gramophone.R;
+import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.CannotDeleteSingleSongsSongAdapter;
+import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.SmartPlaylistSongAdapter;
+import com.kabouzeid.gramophone.interfaces.CabHolder;
+import com.kabouzeid.gramophone.loader.LastAddedLoader;
+import com.kabouzeid.gramophone.model.Song;
+
+import java.util.ArrayList;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class MyTopTracksPlaylist extends SmartPlaylist {
+
+    public MyTopTracksPlaylist(Context context) {
+        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_white_24dp);
+    }
+
+    @Override
+    public ArrayList<Song> getSongs(Context context) {
+        // TODO replace with getSongs() for top tracks. This is just a place holder
+        return LastAddedLoader.getLastAddedSongs(context);
+    }
+
+    @Override
+    public SmartPlaylistSongAdapter createAdapter(AppCompatActivity activity, @Nullable CabHolder cabHolder) {
+        return new CannotDeleteSingleSongsSongAdapter(activity, this, cabHolder);
+    }
+
+    @Override
+    public void clear(Context context) {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/RecentlyPlayedPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/RecentlyPlayedPlaylist.java
new file mode 100644
index 00000000..3d908a23
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/RecentlyPlayedPlaylist.java
@@ -0,0 +1,40 @@
+package com.kabouzeid.gramophone.model.smartplaylist;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.kabouzeid.gramophone.R;
+import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.CannotDeleteSingleSongsSongAdapter;
+import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.SmartPlaylistSongAdapter;
+import com.kabouzeid.gramophone.interfaces.CabHolder;
+import com.kabouzeid.gramophone.loader.LastAddedLoader;
+import com.kabouzeid.gramophone.model.Song;
+
+import java.util.ArrayList;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class RecentlyPlayedPlaylist extends SmartPlaylist {
+
+    public RecentlyPlayedPlaylist(Context context) {
+        super(context.getString(R.string.recently_played), R.drawable.ic_access_time_white_24dp);
+    }
+
+    @Override
+    public ArrayList<Song> getSongs(Context context) {
+        // TODO replace with getSongs() for recently played. This is just a place holder
+        return LastAddedLoader.getLastAddedSongs(context);
+    }
+
+    @Override
+    public SmartPlaylistSongAdapter createAdapter(AppCompatActivity activity, @Nullable CabHolder cabHolder) {
+        return new CannotDeleteSingleSongsSongAdapter(activity, this, cabHolder);
+    }
+
+    @Override
+    public void clear(Context context) {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/SmartPlaylist.java b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/SmartPlaylist.java
similarity index 68%
rename from app/src/main/java/com/kabouzeid/gramophone/model/SmartPlaylist.java
rename to app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/SmartPlaylist.java
index 27325303..a1cce483 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/SmartPlaylist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/SmartPlaylist.java
@@ -1,9 +1,15 @@
-package com.kabouzeid.gramophone.model;
+package com.kabouzeid.gramophone.model.smartplaylist;
 
 import android.content.Context;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 
 import com.kabouzeid.gramophone.R;
+import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.SmartPlaylistSongAdapter;
+import com.kabouzeid.gramophone.interfaces.CabHolder;
+import com.kabouzeid.gramophone.model.Playlist;
+import com.kabouzeid.gramophone.model.Song;
 
 import java.util.ArrayList;
 
@@ -28,6 +34,10 @@ public abstract class SmartPlaylist extends Playlist {
 
     public abstract ArrayList<Song> getSongs(Context context);
 
+    public abstract SmartPlaylistSongAdapter createAdapter(AppCompatActivity activity, @Nullable CabHolder cabHolder);
+
+    public abstract void clear(Context context);
+
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java
index 181b64f9..cd606c91 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java
@@ -12,11 +12,10 @@ import android.widget.TextView;
 import com.afollestad.materialcab.MaterialCab;
 import com.kabouzeid.gramophone.App;
 import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.LastAddedSongAdapter;
 import com.kabouzeid.gramophone.adapter.songadapter.smartplaylist.SmartPlaylistSongAdapter;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
 import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
-import com.kabouzeid.gramophone.model.SmartPlaylist;
+import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtils;
@@ -62,7 +61,7 @@ public class SmartPlaylistDetailActivity extends AbsFabActivity implements CabHo
     }
 
     private void setUpRecyclerView() {
-        adapter = new LastAddedSongAdapter(this, this);
+        adapter = playlist.createAdapter(this, this);
 
         recyclerView.setLayoutManager(new GridLayoutManager(this, 1));
         recyclerView.setAdapter(adapter);
@@ -115,7 +114,7 @@ public class SmartPlaylistDetailActivity extends AbsFabActivity implements CabHo
                 NavigationUtil.openPlayingQueueDialog(this);
                 return true;
             case R.id.action_clear_playlist:
-                //TODO
+                playlist.clear(this);
                 return true;
         }
         return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
index b2c70fca..b229bdef 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
@@ -16,7 +16,7 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
 import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.model.Playlist;
-import com.kabouzeid.gramophone.model.SmartPlaylist;
+import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 import com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity;
 import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity;
 import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity;
diff --git a/app/src/main/res/layout/artist_detail_header.xml b/app/src/main/res/layout/artist_detail_header.xml
index 8182109c..ce188247 100644
--- a/app/src/main/res/layout/artist_detail_header.xml
+++ b/app/src/main/res/layout/artist_detail_header.xml
@@ -8,7 +8,6 @@
         android:layout_width="match_parent"
         android:layout_height="164dp"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
         android:scrollbars="none" />
 
     <View
diff --git a/app/src/main/res/layout/item_grid_artist_album.xml b/app/src/main/res/layout/item_grid_artist_album.xml
index 63261a0a..c2fdcd68 100644
--- a/app/src/main/res/layout/item_grid_artist_album.xml
+++ b/app/src/main/res/layout/item_grid_artist_album.xml
@@ -3,11 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="104dp"
     android:layout_height="148dp"
-    android:layout_marginRight="8dp"
     android:layout_marginEnd="8dp"
-    app:cardBackgroundColor="?default_bar_color"
-    app:elevation="3dp"
-    android:foreground="?rect_selector">
+    android:layout_marginRight="8dp"
+    android:foreground="?rect_selector"
+    app:cardBackgroundColor="?card_color"
+    app:elevation="3dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -25,8 +25,7 @@
         <LinearLayout
             android:id="@+id/footer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?card_color">
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_list_playlist.xml b/app/src/main/res/layout/item_list_playlist.xml
index 8b340ff8..353e3f37 100644
--- a/app/src/main/res/layout/item_list_playlist.xml
+++ b/app/src/main/res/layout/item_list_playlist.xml
@@ -3,8 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:background="?card_color"
-    android:elevation="2dp"
     android:foreground="?rect_selector"
     tools:ignore="UnusedAttribute">
 
diff --git a/app/src/main/res/layout/item_list_smart_playlist.xml b/app/src/main/res/layout/item_list_smart_playlist.xml
index 066b1ba3..8edf90c2 100644
--- a/app/src/main/res/layout/item_list_smart_playlist.xml
+++ b/app/src/main/res/layout/item_list_smart_playlist.xml
@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
+    android:background="?card_color"
+    android:elevation="2dp"
     android:foreground="?rect_selector"
     tools:ignore="UnusedAttribute">
 
diff --git a/app/src/main/res/menu/menu_last_added_playlist_songs_selection.xml b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
similarity index 100%
rename from app/src/main/res/menu/menu_last_added_playlist_songs_selection.xml
rename to app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
diff --git a/app/src/main/res/menu/menu_item_last_added_playlist_song.xml b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
similarity index 100%
rename from app/src/main/res/menu/menu_item_last_added_playlist_song.xml
rename to app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index efd710d6..88a9fdd1 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -10,13 +10,13 @@
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/action_clear_playlist"
-        android:title="@string/action_clear_playlist"
+        android:id="@+id/action_playing_queue"
+        android:title="@string/action_playing_queue"
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/action_playing_queue"
-        android:title="@string/action_playing_queue"
+        android:id="@+id/action_clear_playlist"
+        android:title="@string/action_clear_playlist"
         app:showAsAction="never" />
 
     <item
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 7f9a3629..3ad3ae5b 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -25,7 +25,7 @@
         <item name="check_mark_color">@color/grey_900</item>
 
         <item name="default_bar_color">@color/materialmusic_dark_default_bar_color</item>
-        <item name="card_color">@color/materialmusic_dark_default_bar_color</item>
+        <item name="card_color">@color/grey_800</item>
 
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>