Convert a bunch of other fragments to RecyclerView

22 files changed, 377 insertions, 319 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/BasicListAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/BasicListAdapter.java
new file mode 100644
index 00000000..dfea91bf
--- /dev/null
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/BasicListAdapter.java
@@ -0,0 +1,48 @@
+/*
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
+
+package github.daneren2005.dsub.adapter;
+
+import android.content.Context;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import github.daneren2005.dsub.view.BasicListView;
+import github.daneren2005.dsub.view.UpdateView;
+
+public class BasicListAdapter extends SectionAdapter<String> {
+	public static int VIEW_TYPE_LINE = 1;
+
+	public BasicListAdapter(Context context, List<String> strings, OnItemClickedListener listener) {
+		super(context, strings);
+		this.onItemClickedListener = listener;
+	}
+
+	@Override
+	public UpdateView.UpdateViewHolder onCreateSectionViewHolder(ViewGroup parent, int viewType) {
+		return new UpdateView.UpdateViewHolder(new BasicListView(context));
+	}
+
+	@Override
+	public void onBindViewHolder(UpdateView.UpdateViewHolder holder, String item, int viewType) {
+		holder.getUpdateView().setObject(item);
+	}
+
+	@Override
+	public int getItemViewType(String item) {
+		return VIEW_TYPE_LINE;
+	}
+}
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/BookmarkAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/BookmarkAdapter.java
index 26d3e16a..8335966d 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/BookmarkAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/BookmarkAdapter.java
@@ -1,20 +1,16 @@
 /*
-	This file is part of Subsonic.
-	
+  This file is part of Subsonic.
 	Subsonic is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
 	Subsonic is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU General Public License for more details.
-	
 	You should have received a copy of the GNU General Public License
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
-	
-	Copyright 2010 (C) Sindre Mehus
+	Copyright 2015 (C) Scott Jackson
 */
 
 package github.daneren2005.dsub.adapter;
@@ -22,9 +18,7 @@ package github.daneren2005.dsub.adapter;
 import android.content.Context;
 
 import java.util.List;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
 import github.daneren2005.dsub.R;
@@ -32,33 +26,36 @@ import github.daneren2005.dsub.domain.Bookmark;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.view.SongView;
+import github.daneren2005.dsub.view.UpdateView;
 
-public class BookmarkAdapter extends ArrayAdapter<MusicDirectory.Entry> {
+public class BookmarkAdapter extends SectionAdapter<MusicDirectory.Entry> {
 	private final static String TAG = BookmarkAdapter.class.getSimpleName();
-	private Context activity;
 	
-	public BookmarkAdapter(Context activity, List<MusicDirectory.Entry> bookmarks) {
-		super(activity, android.R.layout.simple_list_item_1, bookmarks);
-		this.activity = activity;
+	public BookmarkAdapter(Context activity, List<MusicDirectory.Entry> bookmarks, OnItemClickedListener listener) {
+		super(activity, bookmarks);
+		this.onItemClickedListener = listener;
 	}
-	
-	public View getView(int position, View convertView, ViewGroup parent) {
-		MusicDirectory.Entry entry = getItem(position);
-		Bookmark bookmark = entry.getBookmark();
 
-		SongView view;
-		if (convertView != null) {
-			view = (SongView) convertView;
-		} else {
-			view = new SongView(activity);
-		}
-		view.setObject(entry, false);
-		
+	@Override
+	public UpdateView.UpdateViewHolder onCreateSectionViewHolder(ViewGroup parent, int viewType) {
+		return new UpdateView.UpdateViewHolder(new SongView(context));
+	}
+
+	@Override
+	public void onBindViewHolder(UpdateView.UpdateViewHolder holder, MusicDirectory.Entry item, int viewType) {
+		SongView songView = (SongView) holder.getUpdateView();
+		Bookmark bookmark = item.getBookmark();
+
+		songView.setObject(item, false);
+
 		// Add current position to duration
-		TextView durationTextView = (TextView) view.findViewById(R.id.song_duration);
+		TextView durationTextView = (TextView) songView.findViewById(R.id.song_duration);
 		String duration = durationTextView.getText().toString();
 		durationTextView.setText(Util.formatDuration(bookmark.getPosition() / 1000) + " / " + duration);
-		
-		return view;
+	}
+
+	@Override
+	public int getItemViewType(MusicDirectory.Entry item) {
+		return EntryGridAdapter.VIEW_TYPE_SONG;
 	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
index 1a4d96a4..48b278ec 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
@@ -83,7 +83,7 @@ public class EntryGridAdapter extends SectionAdapter<Entry> {
 			albumView.setObject(entry, imageLoader);
 		} else if(viewType == VIEW_TYPE_SONG) {
 			SongView songView = (SongView) view;
-			songView.setObject(entry, checkable);
+			songView.setObject(entry, checkable && !entry.isVideo());
 		}
 	}
 
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/GenreAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/GenreAdapter.java
index abb208c9..7e6954f9 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/GenreAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/GenreAdapter.java
@@ -1,60 +1,48 @@
 /*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
 
- Copyright 2010 (C) Sindre Mehus
- */
 package github.daneren2005.dsub.adapter;
 
-import android.widget.ArrayAdapter;
-import android.widget.SectionIndexer;
 import android.content.Context;
-import android.view.View;
 import android.view.ViewGroup;
-import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.Genre;
 import github.daneren2005.dsub.view.GenreView;
+import github.daneren2005.dsub.view.UpdateView;
 
 import java.util.List;
-import java.util.Set;
-import java.util.LinkedHashSet;
-import java.util.ArrayList;
 
-/**
- * @author Sindre Mehus
-*/
-public class GenreAdapter extends ArrayAdapter<Genre>{
-	private Context activity;
-	private List<Genre> genres;
-
-    public GenreAdapter(Context context, List<Genre> genres) {
-        super(context, android.R.layout.simple_list_item_1, genres);
-		this.activity = context;
-		this.genres = genres;
+public class GenreAdapter extends SectionAdapter<Genre>{
+	public static int VIEW_TYPE_GENRE = 1;
+
+	public GenreAdapter(Context context, List<Genre> genres, OnItemClickedListener listener) {
+        super(context, genres);
+		this.onItemClickedListener = listener;
     }
-	
+
 	@Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        Genre genre = genres.get(position);
-		GenreView view;
-		if (convertView != null && convertView instanceof GenreView) {
-			view = (GenreView) convertView;
-		} else {
-			view = new GenreView(activity);
-		}
-		view.setObject(genre);
-		return view;
-    }
+	public UpdateView.UpdateViewHolder onCreateSectionViewHolder(ViewGroup parent, int viewType) {
+		return new UpdateView.UpdateViewHolder(new GenreView(context));
+	}
+
+	@Override
+	public void onBindViewHolder(UpdateView.UpdateViewHolder holder, Genre item, int viewType) {
+		holder.getUpdateView().setObject(item);
+	}
+
+	@Override
+	public int getItemViewType(Genre item) {
+		return VIEW_TYPE_GENRE;
+	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
index 8ee39a10..dc94178d 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
@@ -1,60 +1,47 @@
 /*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2010 (C) Sindre Mehus
- */
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
 package github.daneren2005.dsub.adapter;
 
-import android.widget.ArrayAdapter;
-import android.widget.SectionIndexer;
 import android.content.Context;
-import android.view.View;
 import android.view.ViewGroup;
-import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.PodcastChannel;
 import github.daneren2005.dsub.view.PodcastChannelView;
+import github.daneren2005.dsub.view.UpdateView;
 
 import java.util.List;
-import java.util.Set;
-import java.util.LinkedHashSet;
-import java.util.ArrayList;
 
-/**
- * @author Sindre Mehus
-*/
-public class PodcastChannelAdapter extends ArrayAdapter<PodcastChannel>{
-	private Context activity;
-	private List<PodcastChannel> podcasts;
+public class PodcastChannelAdapter extends SectionAdapter<PodcastChannel>{
+    public static int VIEW_TYPE_PODCAST = 1;
 
-    public PodcastChannelAdapter(Context context, List<PodcastChannel> podcasts) {
-        super(context, android.R.layout.simple_list_item_1, podcasts);
-		this.activity = context;
-		this.podcasts = podcasts;
+	public PodcastChannelAdapter(Context context, List<PodcastChannel> podcasts, OnItemClickedListener listener) {
+        super(context, podcasts);
+		this.onItemClickedListener = listener;
     }
-	
-	@Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        PodcastChannel podcast = podcasts.get(position);
-		PodcastChannelView view;
-		if (convertView != null && convertView instanceof PodcastChannelView) {
-			view = (PodcastChannelView) convertView;
-		} else {
-			view = new PodcastChannelView(activity);
-		}
-		view.setObject(podcast);
-		return view;
+
+    @Override
+    public UpdateView.UpdateViewHolder onCreateSectionViewHolder(ViewGroup parent, int viewType) {
+        return new UpdateView.UpdateViewHolder(new PodcastChannelView(context));
+    }
+
+    @Override
+    public void onBindViewHolder(UpdateView.UpdateViewHolder holder, PodcastChannel item, int viewType) {
+        holder.getUpdateView().setObject(item);
+    }
+
+    @Override
+    public int getItemViewType(PodcastChannel item) {
+        return VIEW_TYPE_PODCAST;
     }
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
index 5244c7a6..84b21e30 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
@@ -76,7 +76,7 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 					@Override
 					public void onClick(View v) {
 						T item = holder.getItem();
-						if(updateView.isCheckable()) {
+						if (updateView.isCheckable()) {
 							if (selected.contains(item)) {
 								selected.remove(item);
 								setChecked(updateView, false);
@@ -84,20 +84,11 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 								selected.add(item);
 								setChecked(updateView, true);
 							}
-						} else if(onItemClickedListener != null) {
+						} else if (onItemClickedListener != null) {
 							onItemClickedListener.onItemClicked(item);
 						}
 					}
 				});
-				updateView.getChildAt(0).setOnLongClickListener(new View.OnLongClickListener() {
-					@Override
-					public boolean onLongClick(View v) {
-						T item = holder.getItem();
-						setContextItem(updateView, item);
-						v.showContextMenu();
-						return false;
-					}
-				});
 
 				View moreButton = updateView.findViewById(R.id.more_button);
 				if(moreButton == null) {
@@ -112,6 +103,16 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 							v.showContextMenu();
 						}
 					});
+
+					updateView.getChildAt(0).setOnLongClickListener(new View.OnLongClickListener() {
+						@Override
+						public boolean onLongClick(View v) {
+							T item = holder.getItem();
+							setContextItem(updateView, item);
+							v.showContextMenu();
+							return false;
+						}
+					});
 				}
 			}
 
@@ -246,6 +247,11 @@ public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewH
 		// TODO: This needs to work with multiple sections
 		for(T item: selected) {
 			int index = sections.get(0).indexOf(item);
+
+			if(singleSectionHeader) {
+				index++;
+			}
+
 			this.notifyItemChanged(index);
 		}
 		selected.clear();
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/ShareAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/ShareAdapter.java
index 4121a85a..6db3d927 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/ShareAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/ShareAdapter.java
@@ -1,56 +1,49 @@
 /*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
 
- Copyright 2010 (C) Sindre Mehus
- */
 package github.daneren2005.dsub.adapter;
 
 import android.content.Context;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 
 import java.util.List;
 
 import github.daneren2005.dsub.domain.Share;
 import github.daneren2005.dsub.view.ShareView;
+import github.daneren2005.dsub.view.UpdateView;
 
-/**
- * @author Sindre Mehus
-*/
-public class ShareAdapter extends ArrayAdapter<Share>{
-	private Context activity;
-	private List<Share> shares;
-
-    public ShareAdapter(Context context, List<Share> shares) {
-        super(context, android.R.layout.simple_list_item_1, shares);
-		this.activity = context;
-		this.shares = shares;
+public class ShareAdapter extends SectionAdapter<Share>{
+	public static int VIEW_TYPE_SHARE = 1;
+
+	public ShareAdapter(Context context, List<Share> shares, OnItemClickedListener listener) {
+        super(context, shares);
+		this.onItemClickedListener = listener;
     }
-	
+
 	@Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-		Share share = shares.get(position);
-		ShareView view;
-		if (convertView != null && convertView instanceof ShareView) {
-			view = (ShareView) convertView;
-		} else {
-			view = new ShareView(activity);
-		}
-		view.setObject(share);
-		return view;
-    }
+	public UpdateView.UpdateViewHolder onCreateSectionViewHolder(ViewGroup parent, int viewType) {
+		return new UpdateView.UpdateViewHolder(new ShareView(context));
+	}
+
+	@Override
+	public void onBindViewHolder(UpdateView.UpdateViewHolder holder, Share item, int viewType) {
+		holder.getUpdateView().setObject(item);
+	}
+
+	@Override
+	public int getItemViewType(Share item) {
+		return VIEW_TYPE_SHARE;
+	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/UserAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/UserAdapter.java
index f0f78d97..95809e48 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/UserAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/UserAdapter.java
@@ -25,28 +25,32 @@ import java.util.List;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.User;
 import github.daneren2005.dsub.util.ImageLoader;
+import github.daneren2005.dsub.view.UpdateView;
 import github.daneren2005.dsub.view.UserView;
 
-public class UserAdapter extends ArrayAdapter<User> {
-	private final Context activity;
+public class UserAdapter extends SectionAdapter<User> {
+	public static int VIEW_TYPE_USER = 1;
+
 	private final ImageLoader imageLoader;
 
-	public UserAdapter(Context activity, List<User> users, ImageLoader imageLoader) {
-		super(activity, R.layout.basic_list_item, users);
-		this.activity = activity;
+	public UserAdapter(Context context, List<User> users, ImageLoader imageLoader, OnItemClickedListener listener) {
+		super(context, users);
 		this.imageLoader = imageLoader;
+		this.onItemClickedListener = listener;
+	}
+
+	@Override
+	public UpdateView.UpdateViewHolder onCreateSectionViewHolder(ViewGroup parent, int viewType) {
+		return new UpdateView.UpdateViewHolder(new UserView(context));
+	}
+
+	@Override
+	public void onBindViewHolder(UpdateView.UpdateViewHolder holder, User item, int viewType) {
+		holder.getUpdateView().setObject(item, imageLoader);
 	}
 
 	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		User entry = getItem(position);
-		UserView view;
-		if (convertView != null && convertView instanceof UserView) {
-			view = (UserView) convertView;
-		} else {
-			view = new UserView(activity);
-		}
-		view.setObject(entry, imageLoader);
-		return view;
+	public int getItemViewType(User item) {
+		return VIEW_TYPE_USER;
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/AdminFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/AdminFragment.java
index 66ce5f15..f3f9eb64 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/AdminFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/AdminFragment.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.User;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.service.parser.SubsonicRESTException;
@@ -37,7 +38,7 @@ import github.daneren2005.dsub.util.UserUtil;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.adapter.UserAdapter;
 
-public class AdminFragment extends SelectListFragment<User> {
+public class AdminFragment extends SelectRecyclerFragment<User> {
 	private static String TAG = AdminFragment.class.getSimpleName();
 
 	@Override
@@ -69,8 +70,7 @@ public class AdminFragment extends SelectListFragment<User> {
 
 	@Override
 	public boolean onContextItemSelected(MenuItem menuItem) {
-		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-		User user = objects.get(info.position);
+		User user = adapter.getContextItem();
 
 		switch(menuItem.getItemId()) {
 			case R.id.admin_change_email:
@@ -97,8 +97,8 @@ public class AdminFragment extends SelectListFragment<User> {
 	}
 
 	@Override
-	public ArrayAdapter getAdapter(List<User> objs) {
-		return new UserAdapter(context, objs, getImageLoader());
+	public SectionAdapter getAdapter(List<User> objs) {
+		return new UserAdapter(context, objs, getImageLoader(), this);
 	}
 
 	@Override
@@ -134,9 +134,7 @@ public class AdminFragment extends SelectListFragment<User> {
 	}
 
 	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		User user = (User) parent.getItemAtPosition(position);
-
+	public void onItemClicked(User user) {
 		SubsonicFragment fragment = new UserFragment();
 		Bundle args = new Bundle();
 		args.putSerializable(Constants.INTENT_EXTRA_NAME_ID, user);
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java
index 830e2957..a774a287 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java
@@ -25,6 +25,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.Bookmark;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.service.DownloadService;
@@ -33,16 +34,19 @@ import github.daneren2005.dsub.util.ProgressListener;
 import github.daneren2005.dsub.util.SilentBackgroundTask;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.adapter.BookmarkAdapter;
+import github.daneren2005.dsub.view.UpdateView;
 
 import java.util.Arrays;
 import java.util.List;
 
-public class SelectBookmarkFragment extends SelectListFragment<MusicDirectory.Entry> {
+public class SelectBookmarkFragment extends SelectRecyclerFragment<MusicDirectory.Entry> {
 	private static final String TAG = SelectBookmarkFragment.class.getSimpleName();
 
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
 		super.onCreateContextMenu(menu, view, menuInfo);
+		UpdateView targetView = adapter.getContextView();
+		menuInfo = new AdapterView.AdapterContextMenuInfo(targetView, 0, 0);
 
 		MenuInflater inflater = context.getMenuInflater();
 		inflater.inflate(R.menu.select_bookmark_context, menu);
@@ -52,8 +56,7 @@ public class SelectBookmarkFragment extends SelectListFragment<MusicDirectory.En
 
 	@Override
 	public boolean onContextItemSelected(MenuItem menuItem) {
-		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-		MusicDirectory.Entry bookmark = objects.get(info.position);
+		MusicDirectory.Entry bookmark = adapter.getContextItem();
 		
 		switch(menuItem.getItemId()) {
 			case R.id.bookmark_menu_info:
@@ -77,8 +80,8 @@ public class SelectBookmarkFragment extends SelectListFragment<MusicDirectory.En
 	}
 
 	@Override
-	public ArrayAdapter getAdapter(List<MusicDirectory.Entry> bookmarks) {
-		return new BookmarkAdapter(context, bookmarks);
+	public SectionAdapter getAdapter(List<MusicDirectory.Entry> bookmarks) {
+		return new BookmarkAdapter(context, bookmarks, this);
 	}
 
 	@Override
@@ -92,13 +95,12 @@ public class SelectBookmarkFragment extends SelectListFragment<MusicDirectory.En
 	}
 
 	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+	public void onItemClicked(final MusicDirectory.Entry bookmark) {
 		final DownloadService downloadService = getDownloadService();
 		if(downloadService == null) {
 			return;
 		}
 
-		final MusicDirectory.Entry bookmark = (MusicDirectory.Entry) parent.getItemAtPosition(position);
 		new SilentBackgroundTask<Void>(context) {
 			@Override
 			protected Void doInBackground() throws Throwable {
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectGenreFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectGenreFragment.java
index 2d310172..fe012f62 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectGenreFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectGenreFragment.java
@@ -1,21 +1,18 @@
 /*
- This file is part of Subsonic.
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
 
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2010 (C) Sindre Mehus
- */
 package github.daneren2005.dsub.fragments;
 
 import android.os.Bundle;
@@ -23,6 +20,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.Genre;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.util.Constants;
@@ -31,7 +29,7 @@ import github.daneren2005.dsub.adapter.GenreAdapter;
 
 import java.util.List;
 
-public class SelectGenreFragment extends SelectListFragment<Genre> {
+public class SelectGenreFragment extends SelectRecyclerFragment<Genre> {
 	private static final String TAG = SelectGenreFragment.class.getSimpleName();
 
 	@Override
@@ -40,8 +38,8 @@ public class SelectGenreFragment extends SelectListFragment<Genre> {
 	}
 
 	@Override
-	public ArrayAdapter getAdapter(List<Genre> objs) {
-		return new GenreAdapter(context, objs);
+	public SectionAdapter getAdapter(List<Genre> objs) {
+		return new GenreAdapter(context, objs, this);
 	}
 
 	@Override
@@ -55,9 +53,7 @@ public class SelectGenreFragment extends SelectListFragment<Genre> {
 	}
 	
 	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		Genre genre = (Genre) parent.getItemAtPosition(position);
-		
+	public void onItemClicked(Genre genre) {
 		SubsonicFragment fragment = new SelectDirectoryFragment();
 		Bundle args = new Bundle();
 		args.putString(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE, "genres");
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
index 3a564f1c..eebb1a8a 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
@@ -1,21 +1,17 @@
 /*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2010 (C) Sindre Mehus
- */
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
 package github.daneren2005.dsub.fragments;
 
 import android.app.AlertDialog;
@@ -24,10 +20,9 @@ import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.domain.PodcastChannel;
 import github.daneren2005.dsub.service.MusicService;
@@ -46,11 +41,7 @@ import github.daneren2005.dsub.adapter.PodcastChannelAdapter;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- *
- * @author Scott
- */
-public class SelectPodcastsFragment extends SelectListFragment<PodcastChannel> {
+public class SelectPodcastsFragment extends SelectRecyclerFragment<PodcastChannel> {
 	private static final String TAG = SelectPodcastsFragment.class.getSimpleName();
 	
 	@Override
@@ -79,8 +70,7 @@ public class SelectPodcastsFragment extends SelectListFragment<PodcastChannel> {
 		if(!Util.isOffline(context) && UserUtil.canPodcast()) {
 			inflater.inflate(R.menu.select_podcasts_context, menu);
 
-			AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
-			PodcastChannel podcast = (PodcastChannel) listView.getItemAtPosition(info.position);
+			PodcastChannel podcast = adapter.getContextItem();
 			if(SyncUtil.isSyncedPodcast(context, podcast.getId())) {
 				menu.removeItem(R.id.podcast_menu_sync);
 			} else {
@@ -98,10 +88,8 @@ public class SelectPodcastsFragment extends SelectListFragment<PodcastChannel> {
 		if(menuItem.getGroupId() != getSupportTag()) {
 			return false;
 		}
-		
-		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-		PodcastChannel channel = (PodcastChannel) listView.getItemAtPosition(info.position);
 
+		PodcastChannel channel = adapter.getContextItem();
 		switch (menuItem.getItemId()) {
 			case R.id.podcast_menu_sync:
 				syncPodcast(channel);
@@ -126,8 +114,8 @@ public class SelectPodcastsFragment extends SelectListFragment<PodcastChannel> {
 	}
 
 	@Override
-	public ArrayAdapter getAdapter(List<PodcastChannel> channels) {
-		return new PodcastChannelAdapter(context, channels);
+	public SectionAdapter getAdapter(List<PodcastChannel> channels) {
+		return new PodcastChannelAdapter(context, channels, this);
 	}
 
 	@Override
@@ -141,9 +129,7 @@ public class SelectPodcastsFragment extends SelectListFragment<PodcastChannel> {
 	}
 
 	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		PodcastChannel channel = (PodcastChannel) parent.getItemAtPosition(position);
-		
+	public void onItemClicked(PodcastChannel channel) {
 		if("error".equals(channel.getStatus())) {
 			Util.toast(context, context.getResources().getString(R.string.select_podcasts_invalid_podcast_channel, channel.getErrorMessage() == null ? "error" : channel.getErrorMessage()));
 		} else if("downloading".equals(channel.getStatus())) {
@@ -258,8 +244,7 @@ public class SelectPodcastsFragment extends SelectListFragment<PodcastChannel> {
 
 					@Override
 					protected void done(Void result) {
-						adapter.remove(channel);
-						adapter.notifyDataSetChanged();
+						adapter.removeItem(channel);
 						Util.toast(context, context.getResources().getString(R.string.select_podcasts_deleted, channel.getName()));
 					}
 
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectRecyclerFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectRecyclerFragment.java
index afcbf273..bd4d9526 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectRecyclerFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectRecyclerFragment.java
@@ -12,6 +12,7 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2015 (C) Scott Jackson
 */
+
 package github.daneren2005.dsub.fragments;
 
 import android.os.Bundle;
@@ -50,6 +51,7 @@ public abstract class SelectRecyclerFragment<T> extends SubsonicFragment impleme
 	protected boolean serialize = true;
 	protected boolean largeCells = false;
 	protected int columns;
+	protected boolean pullToRefresh = true;
 
 	@Override
 	public void onCreate(Bundle bundle) {
@@ -78,7 +80,12 @@ public abstract class SelectRecyclerFragment<T> extends SubsonicFragment impleme
 
 		recyclerView = (RecyclerView) rootView.findViewById(R.id.fragment_recycler);
 		setupLayoutManager();
-		setupScrollList(recyclerView);
+
+		if(pullToRefresh) {
+			setupScrollList(recyclerView);
+		} else {
+			refreshLayout.setEnabled(false);
+		}
 
 		if(objects == null) {
 			refresh(false);
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectShareFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectShareFragment.java
index 07cd3bef..87dd55b4 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectShareFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectShareFragment.java
@@ -1,3 +1,18 @@
+/*
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
+
 package github.daneren2005.dsub.fragments;
 
 import android.app.AlertDialog;
@@ -6,8 +21,6 @@ import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.DatePicker;
@@ -17,6 +30,7 @@ import java.util.Date;
 import java.util.List;
 
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.Share;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.service.MusicServiceFactory;
@@ -28,10 +42,7 @@ import github.daneren2005.dsub.util.ProgressListener;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.adapter.ShareAdapter;
 
-/**
- * Created by Scott on 12/28/13.
- */
-public class SelectShareFragment extends SelectListFragment<Share> {
+public class SelectShareFragment extends SelectRecyclerFragment<Share> {
 	private static final String TAG = SelectShareFragment.class.getSimpleName();
 
 	@Override
@@ -48,9 +59,7 @@ public class SelectShareFragment extends SelectListFragment<Share> {
 			return false;
 		}
 
-		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-		Share share = (Share) listView.getItemAtPosition(info.position);
-
+		Share share = adapter.getContextItem();
 		switch (menuItem.getItemId()) {
 			case R.id.share_menu_share:
 				shareExternal(share);
@@ -75,8 +84,8 @@ public class SelectShareFragment extends SelectListFragment<Share> {
 	}
 
 	@Override
-	public ArrayAdapter getAdapter(List<Share> objs) {
-		return new ShareAdapter(context, objs);
+	public SectionAdapter getAdapter(List<Share> objs) {
+		return new ShareAdapter(context, objs, this);
 	}
 
 	@Override
@@ -90,9 +99,7 @@ public class SelectShareFragment extends SelectListFragment<Share> {
 	}
 
 	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		Share share = (Share) parent.getItemAtPosition(position);
-
+	public void onItemClicked(Share share) {
 		SubsonicFragment fragment = new SelectDirectoryFragment();
 		Bundle args = new Bundle();
 		args.putSerializable(Constants.INTENT_EXTRA_NAME_SHARE, share);
@@ -193,8 +200,7 @@ public class SelectShareFragment extends SelectListFragment<Share> {
 
 					@Override
 					protected void done(Void result) {
-						adapter.remove(share);
-						adapter.notifyDataSetChanged();
+						adapter.removeItem(share);
 						Util.toast(context, context.getResources().getString(R.string.share_deleted, share.getName()));
 					}
 
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectVideoFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectVideoFragment.java
index b4d34ff9..e91a163c 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectVideoFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectVideoFragment.java
@@ -24,20 +24,25 @@ import android.widget.ArrayAdapter;
 import java.util.List;
 
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.EntryGridAdapter;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.util.ProgressListener;
 import github.daneren2005.dsub.adapter.EntryAdapter;
+import github.daneren2005.dsub.view.UpdateView;
 
-public class SelectVideoFragment extends SelectListFragment<MusicDirectory.Entry> {
+public class SelectVideoFragment extends SelectRecyclerFragment<MusicDirectory.Entry> {
 	@Override
 	public int getOptionsMenu() {
 		return R.menu.empty;
 	}
 
 	@Override
-	public ArrayAdapter getAdapter(List<MusicDirectory.Entry> objs) {
-		return new EntryAdapter(context, null, objs, false);
+	public SectionAdapter getAdapter(List<MusicDirectory.Entry> objs) {
+		SectionAdapter adapter = new EntryGridAdapter(context, objs, null, false);
+		adapter.setOnItemClickedListener(this);
+		return adapter;
 	}
 
 	@Override
@@ -52,18 +57,17 @@ public class SelectVideoFragment extends SelectListFragment<MusicDirectory.Entry
 	}
 
 	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		MusicDirectory.Entry entry = (MusicDirectory.Entry) parent.getItemAtPosition(position);
+	public void onItemClicked(MusicDirectory.Entry entry) {
 		playVideo(entry);
 	}
 
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) {
 		super.onCreateContextMenu(menu, view, menuInfo);
+		UpdateView targetView = adapter.getContextView();
+		menuInfo = new AdapterView.AdapterContextMenuInfo(targetView, 0, 0);
 
-		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
-		Object entry = listView.getItemAtPosition(info.position);
-
+		MusicDirectory.Entry entry = adapter.getContextItem();
 		onCreateContextMenu(menu, view, menuInfo, entry);
 		recreateContextMenu(menu);
 	}
@@ -74,9 +78,7 @@ public class SelectVideoFragment extends SelectListFragment<MusicDirectory.Entry
 			return false;
 		}
 
-		AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-		Object entry = listView.getItemAtPosition(info.position);
-
+		MusicDirectory.Entry entry = adapter.getContextItem();
 		return onContextItemSelected(menuItem, entry);
 	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java
index dc19acad..a89bc280 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java
@@ -1,21 +1,18 @@
 /*
-	This file is part of Subsonic.
-
+  This file is part of Subsonic.
 	Subsonic is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-
 	Subsonic is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU General Public License for more details.
-
 	You should have received a copy of the GNU General Public License
-	along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
-	Copyright 2010 (C) Sindre Mehus
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
 */
+
 package github.daneren2005.dsub.fragments;
 
 import android.os.Bundle;
@@ -27,14 +24,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.BasicListAdapter;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.util.Constants;
 import github.daneren2005.dsub.util.ProgressListener;
 
-/**
- * Created by Scott on 12/23/13.
- */
-public class SelectYearFragment extends SelectListFragment<Integer> {
+public class SelectYearFragment extends SelectRecyclerFragment<String> {
 
 	@Override
 	public int getOptionsMenu() {
@@ -42,15 +38,15 @@ public class SelectYearFragment extends SelectListFragment<Integer> {
 	}
 
 	@Override
-	public ArrayAdapter getAdapter(List<Integer> objs) {
-		return new ArrayAdapter<Integer>(context, android.R.layout.simple_list_item_1, objs);
+	public SectionAdapter getAdapter(List<String> objs) {
+		return new BasicListAdapter(context, objs, this);
 	}
 
 	@Override
-	public List<Integer> getObjects(MusicService musicService, boolean refresh, ProgressListener listener) throws Exception {
-		List<Integer> decades = new ArrayList<Integer>();
+	public List<String> getObjects(MusicService musicService, boolean refresh, ProgressListener listener) throws Exception {
+		List<String> decades = new ArrayList<>();
 		for(int i = 2010; i >= 1920; i -= 10) {
-			decades.add(i);
+			decades.add(String.valueOf(i));
 		}
 
 		return decades;
@@ -62,15 +58,13 @@ public class SelectYearFragment extends SelectListFragment<Integer> {
 	}
 
 	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		Integer decade = (Integer) parent.getItemAtPosition(position);
-
+	public void onItemClicked(String decade) {
 		SubsonicFragment fragment = new SelectDirectoryFragment();
 		Bundle args = new Bundle();
 		args.putString(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE, "years");
 		args.putInt(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 20);
 		args.putInt(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, 0);
-		args.putString(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_EXTRA, Integer.toString(decade));
+		args.putString(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_EXTRA, decade);
 		fragment.setArguments(args);
 
 		replaceFragment(fragment);
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 6070185d..82d5d97f 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -54,6 +54,7 @@ import android.widget.TextView;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.activity.SubsonicActivity;
 import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.Artist;
 import github.daneren2005.dsub.domain.Bookmark;
 import github.daneren2005.dsub.domain.Genre;
@@ -1627,7 +1628,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
 		}.execute();
 	}
 
-	protected void deleteBookmark(final MusicDirectory.Entry entry, final ArrayAdapter adapter) {
+	protected void deleteBookmark(final MusicDirectory.Entry entry, final SectionAdapter adapter) {
 		Util.confirmDialog(context, R.string.bookmark_delete_title, entry.getTitle(), new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -1653,8 +1654,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
 					@Override
 					protected void done(Void result) {
 						if (adapter != null) {
-							adapter.remove(entry);
-							adapter.notifyDataSetChanged();
+							adapter.removeItem(entry);
 						}
 						Util.toast(context, context.getResources().getString(R.string.bookmark_deleted, entry.getTitle()));
 					}
diff --git a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
index 29618424..5c5f1543 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
@@ -28,6 +28,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.adapter.SectionAdapter;
 import github.daneren2005.dsub.domain.User;
 import github.daneren2005.dsub.fragments.SubsonicFragment;
 import github.daneren2005.dsub.service.DownloadService;
@@ -326,7 +327,7 @@ public final class UserUtil {
 		});
 	}
 
-	public static void deleteUser(final Context context, final User user, final ArrayAdapter adapter) {
+	public static void deleteUser(final Context context, final User user, final SectionAdapter adapter) {
 		Util.confirmDialog(context, R.string.common_delete, user.getUsername(), new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
@@ -341,8 +342,7 @@ public final class UserUtil {
 					@Override
 					protected void done(Void v) {
 						if(adapter != null) {
-							adapter.remove(user);
-							adapter.notifyDataSetChanged();
+							adapter.removeItem(user);
 						}
 
 						Util.toast(context, context.getResources().getString(R.string.admin_delete_user_success, user.getUsername()));
diff --git a/app/src/main/java/github/daneren2005/dsub/view/BasicListView.java b/app/src/main/java/github/daneren2005/dsub/view/BasicListView.java
new file mode 100644
index 00000000..3169f903
--- /dev/null
+++ b/app/src/main/java/github/daneren2005/dsub/view/BasicListView.java
@@ -0,0 +1,45 @@
+/*
+  This file is part of Subsonic.
+	Subsonic is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	Subsonic is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
+	Copyright 2015 (C) Scott Jackson
+*/
+
+package github.daneren2005.dsub.view;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import github.daneren2005.dsub.R;
+
+public class BasicListView extends UpdateView {
+	private TextView titleView;
+
+	public BasicListView(Context context) {
+		super(context, false);
+		this.context = context;
+		LayoutInflater.from(context).inflate(R.layout.basic_list_item, this, true);
+
+		titleView = (TextView) findViewById(R.id.item_name);
+		starButton = (ImageButton) findViewById(R.id.item_star);
+		starButton.setFocusable(false);
+		moreButton = (ImageView) findViewById(R.id.item_more);
+		moreButton.setVisibility(View.GONE);
+	}
+
+	protected void setObjectImpl(Object obj) {
+		titleView.setText((String) obj);
+	}
+}
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SongView.java b/app/src/main/java/github/daneren2005/dsub/view/SongView.java
index a5522719..49a09578 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SongView.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/SongView.java
@@ -140,7 +140,7 @@ public class SongView extends UpdateView implements Checkable {
 
         titleTextView.setText(title);
 		artistTextView.setText(artist);
-        checkedTextView.setVisibility(checkable && !song.isVideo() ? View.VISIBLE : View.GONE);
+        checkedTextView.setVisibility(checkable ? View.VISIBLE : View.GONE);
 
 		this.setBackgroundColor(0x00000000);
 		ratingBar.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/genre_list_item.xml b/app/src/main/res/layout/genre_list_item.xml
index 6affa24c..9a6e4245 100644
--- a/app/src/main/res/layout/genre_list_item.xml
+++ b/app/src/main/res/layout/genre_list_item.xml
@@ -3,7 +3,7 @@
 	android:orientation="horizontal"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="@android:color/transparent">
+	android:background="@drawable/abc_item_background_holo_light">
 
 	<TextView
 		android:id="@+id/genre_name"
diff --git a/app/src/main/res/layout/user_list_item.xml b/app/src/main/res/layout/user_list_item.xml
index dc2bdab9..71cafacd 100644
--- a/app/src/main/res/layout/user_list_item.xml
+++ b/app/src/main/res/layout/user_list_item.xml
@@ -3,7 +3,7 @@
 			  android:orientation="horizontal"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
-			  android:background="@android:color/transparent">
+			  android:background="@drawable/abc_item_background_holo_light">
 
 	<github.daneren2005.dsub.view.RecyclingImageView
 		android:id="@+id/item_avatar"