1 files changed, 34 insertions, 46 deletions

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;
+	}
 }