Clean ups

This commit is contained in:
Karim Abou Zeid 2015-06-21 13:27:25 +02:00
commit 3bc0059989
22 changed files with 197 additions and 83 deletions

View file

@ -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);
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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;