#453 Move to using a RecyclerView for directories

6 files changed, 166 insertions, 268 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/view/AlbumCell.java b/app/src/main/java/github/daneren2005/dsub/view/AlbumCell.java
deleted file mode 100644
index 8707ece7..00000000
--- a/app/src/main/java/github/daneren2005/dsub/view/AlbumCell.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-  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 2014 (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.RatingBar;
-import android.widget.TextView;
-
-import java.io.File;
-
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.ImageLoader;
-
-public class AlbumCell  extends UpdateView {
-	private static final String TAG = AlbumCell.class.getSimpleName();
-
-	private Context context;
-	private MusicDirectory.Entry album;
-	private File file;
-
-	private View coverArtView;
-	private TextView titleView;
-	private TextView artistView;
-	private boolean showArtist = true;
-
-	public AlbumCell(Context context) {
-		super(context);
-		this.context = context;
-		LayoutInflater.from(context).inflate(R.layout.album_cell_item, this, true);
-
-		coverArtView = findViewById(R.id.album_coverart);
-		titleView = (TextView) findViewById(R.id.album_title);
-		artistView = (TextView) findViewById(R.id.album_artist);
-
-		ratingBar = (RatingBar) findViewById(R.id.album_rating);
-		ratingBar.setFocusable(false);
-		starButton = (ImageButton) findViewById(R.id.album_star);
-		starButton.setFocusable(false);
-		moreButton = (ImageView) findViewById(R.id.album_more);
-		moreButton.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				v.showContextMenu();
-			}
-		});
-	}
-
-	public void setShowArtist(boolean showArtist) {
-		this.showArtist = showArtist;
-	}
-
-	protected void setObjectImpl(Object obj1, Object obj2) {
-		this.album = (MusicDirectory.Entry) obj1;
-		titleView.setText(album.getAlbumDisplay());
-		String artist = "";
-		if(showArtist) {
-			artist = album.getArtist();
-			if (artist == null) {
-				artist = "";
-			}
-			if (album.getYear() != null) {
-				artist += " - " + album.getYear();
-			}
-		} else if(album.getYear() != null) {
-			artist += album.getYear();
-		}
-		artistView.setText(album.getArtist() == null ? "" : artist);
-		imageTask = ((ImageLoader)obj2).loadImage(coverArtView, album, false, true);
-		file = null;
-	}
-
-	@Override
-	protected void updateBackground() {
-		if(file == null) {
-			file = FileUtil.getAlbumDirectory(context, album);
-		}
-
-		exists = file.exists();
-		isStarred = album.isStarred();
-		isRated = album.getRating();
-	}
-
-	public MusicDirectory.Entry getEntry() {
-		return album;
-	}
-
-	public File getFile() {
-		return file;
-	}
-}
diff --git a/app/src/main/java/github/daneren2005/dsub/view/AlbumView.java b/app/src/main/java/github/daneren2005/dsub/view/AlbumView.java
index bd54ea1e..2eb30037 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/AlbumView.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/AlbumView.java
@@ -16,6 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
+
 package github.daneren2005.dsub.view;
 
 import android.content.Context;
@@ -34,11 +35,6 @@ import github.daneren2005.dsub.util.Util;
 import java.io.File;
 import java.util.List;
 
-/**
- * Used to display albums in a {@code ListView}.
- *
- * @author Sindre Mehus
- */
 public class AlbumView extends UpdateView {
 	private static final String TAG = AlbumView.class.getSimpleName();
 
@@ -46,42 +42,55 @@ public class AlbumView extends UpdateView {
 	private MusicDirectory.Entry album;
 	private File file;
 
+	private View coverArtView;
 	private TextView titleView;
 	private TextView artistView;
-	private View coverArtView;
+	private boolean showArtist = true;
 
-	public AlbumView(Context context) {
+	public AlbumView(Context context, boolean cell) {
 		super(context);
 		this.context = context;
-		LayoutInflater.from(context).inflate(R.layout.album_list_item, this, true);
 
+		if(cell) {
+			LayoutInflater.from(context).inflate(R.layout.album_cell_item, this, true);
+		} else {
+			LayoutInflater.from(context).inflate(R.layout.album_list_item, this, true);
+		}
+
+		coverArtView = findViewById(R.id.album_coverart);
 		titleView = (TextView) findViewById(R.id.album_title);
 		artistView = (TextView) findViewById(R.id.album_artist);
-		coverArtView = findViewById(R.id.album_coverart);
+
 		ratingBar = (RatingBar) findViewById(R.id.album_rating);
+		ratingBar.setFocusable(false);
 		starButton = (ImageButton) findViewById(R.id.album_star);
 		starButton.setFocusable(false);
+		moreButton = (ImageView) findViewById(R.id.more_button);
 
-		moreButton = (ImageView) findViewById(R.id.album_more);
-		moreButton.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				v.showContextMenu();
-			}
-		});
+		setClickable(true);
+		setLongClickable(true);
+	}
+
+	public void setShowArtist(boolean showArtist) {
+		this.showArtist = showArtist;
 	}
 
 	protected void setObjectImpl(Object obj1, Object obj2) {
 		this.album = (MusicDirectory.Entry) obj1;
 		titleView.setText(album.getAlbumDisplay());
-		String artist = album.getArtist();
-		if(artist == null) {
-			artist = "";
-		}
-		if(album.getYear() != null) {
-			artist += " - " + album.getYear();
+		String artist = "";
+		if(showArtist) {
+			artist = album.getArtist();
+			if (artist == null) {
+				artist = "";
+			}
+			if (album.getYear() != null) {
+				artist += " - " + album.getYear();
+			}
+		} else if(album.getYear() != null) {
+			artist += album.getYear();
 		}
-		artistView.setText(artist);
-		artistView.setVisibility(album.getArtist() == null ? View.GONE : View.VISIBLE);
+		artistView.setText(album.getArtist() == null ? "" : artist);
 		imageTask = ((ImageLoader)obj2).loadImage(coverArtView, album, false, true);
 		file = null;
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java b/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java
new file mode 100644
index 00000000..3bb3e8a1
--- /dev/null
+++ b/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java
@@ -0,0 +1,99 @@
+/*
+  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.graphics.Rect;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
+import android.view.View;
+
+public class GridSpacingDecoration extends RecyclerView.ItemDecoration {
+
+	@Override
+	public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+		super.getItemOffsets(outRect, view, parent, state);
+
+		int spacing = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, view.getResources().getDisplayMetrics());
+		int halfSpacing = spacing / 2;
+
+		int childCount = parent.getChildCount();
+		int childIndex = parent.getChildPosition(view);
+		int spanCount = getTotalSpan(view, parent);
+		int spanIndex = childIndex % spanCount;
+		int spanSize = getSpanSize(parent, childIndex);
+
+        /* INVALID SPAN */
+		if (spanCount < 1 || spanSize > 1) return;
+
+		outRect.top = halfSpacing;
+		outRect.bottom = halfSpacing;
+		outRect.left = halfSpacing;
+		outRect.right = halfSpacing;
+
+		if (isTopEdge(childIndex, spanCount)) {
+			outRect.top = spacing;
+		}
+
+		if (isLeftEdge(spanIndex, spanCount)) {
+			outRect.left = spacing;
+		}
+
+		if (isRightEdge(spanIndex, spanCount)) {
+			outRect.right = spacing;
+		}
+
+		if (isBottomEdge(childIndex, childCount, spanCount)) {
+			outRect.bottom = spacing;
+		}
+	}
+
+	protected int getTotalSpan(View view, RecyclerView parent) {
+		RecyclerView.LayoutManager mgr = parent.getLayoutManager();
+		if (mgr instanceof GridLayoutManager) {
+			return ((GridLayoutManager) mgr).getSpanCount();
+		}
+
+		return -1;
+	}
+	protected int getSpanSize(RecyclerView parent, int childIndex) {
+		RecyclerView.LayoutManager mgr = parent.getLayoutManager();
+		if (mgr instanceof GridLayoutManager) {
+			GridLayoutManager.SpanSizeLookup lookup = ((GridLayoutManager) mgr).getSpanSizeLookup();
+			if(lookup != null) {
+				return lookup.getSpanSize(childIndex);
+			}
+		}
+
+		return 1;
+	}
+
+	protected boolean isLeftEdge(int spanIndex, int spanCount) {
+		return spanIndex == 0;
+	}
+
+	protected boolean isRightEdge(int spanIndex, int spanCount) {
+		return spanIndex == spanCount - 1;
+	}
+
+	protected boolean isTopEdge(int childIndex, int spanCount) {
+		return childIndex < spanCount;
+	}
+
+	protected boolean isBottomEdge(int childIndex, int childCount, int spanCount) {
+		return childIndex >= childCount - spanCount;
+	}
+}
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 2fbaedc3..a5522719 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SongView.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/SongView.java
@@ -83,18 +83,13 @@ public class SongView extends UpdateView implements Checkable {
         starButton.setFocusable(false);
 		bookmarkButton = (ImageButton) findViewById(R.id.song_bookmark);
 		bookmarkButton.setFocusable(false);
-		moreButton = (ImageView) findViewById(R.id.artist_more);
-		moreButton.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				v.showContextMenu();
-			}
-		});
+		moreButton = (ImageView) findViewById(R.id.more_button);
 		bottomRowView = findViewById(R.id.song_bottom);
     }
 
     public void setObjectImpl(Object obj1, Object obj2) {
         this.song = (MusicDirectory.Entry) obj1;
-		boolean checkable = (Boolean) obj2;
+		checkable = (Boolean) obj2;
 		
         StringBuilder artist = new StringBuilder(40);
 
diff --git a/app/src/main/java/github/daneren2005/dsub/view/UnscrollableGridView.java b/app/src/main/java/github/daneren2005/dsub/view/UnscrollableGridView.java
deleted file mode 100644
index 3047d5d7..00000000
--- a/app/src/main/java/github/daneren2005/dsub/view/UnscrollableGridView.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package github.daneren2005.dsub.view;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.AbsListView;
-import android.widget.GridView;
-import android.widget.ListAdapter;
-
-import java.lang.reflect.Field;
-
-/**
- * Created by Scott on 4/26/2014.
- */
-public class UnscrollableGridView extends GridView {
-	private static final String TAG = UnscrollableGridView.class.getSimpleName();
-
-	public UnscrollableGridView(Context context) {
-		super(context);
-	}
-
-	public UnscrollableGridView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	public UnscrollableGridView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-	}
-
-	@Override
-	public int getColumnWidth() {
-		// This method will be called from onMeasure() too.
-		// It's better to use getMeasuredWidth(), as it is safe in this case.
-
-		int hSpacing = 20;
-		try {
-			Field field = GridView.class.getDeclaredField("mHorizontalSpacing");
-			field.setAccessible(true);
-			hSpacing = field.getInt(this);
-		} catch(Exception e) {
-
-		}
-
-		final int totalHorizontalSpacing = getNumColumnsCompat() > 0 ? (getNumColumnsCompat() - 1) * hSpacing : 0;
-		return (getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - totalHorizontalSpacing) / getNumColumnsCompat();
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		// Sets the padding for this view.
-		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-		final int measuredWidth = getMeasuredWidth();
-		final int childWidth = getColumnWidth();
-		int childHeight = 0;
-
-		// If there's an adapter, use it to calculate the height of this view.
-		final ListAdapter adapter = getAdapter();
-		final int count;
-
-		// There shouldn't be any inherent size (due to padding) if there are no child views.
-		if (adapter == null || (count = adapter.getCount()) == 0) {
-			setMeasuredDimension(0, 0);
-			return;
-		}
-
-		// Get the first child from the adapter.
-		final View child = adapter.getView(0, null, this);
-		if (child != null) {
-			// Set a default LayoutParams on the child, if it doesn't have one on its own.
-			AbsListView.LayoutParams params = (AbsListView.LayoutParams) child.getLayoutParams();
-			if (params == null) {
-				params = new AbsListView.LayoutParams(AbsListView.LayoutParams.WRAP_CONTENT,
-						AbsListView.LayoutParams.WRAP_CONTENT);
-				child.setLayoutParams(params);
-			}
-
-			// Measure the exact width of the child, and the height based on the width.
-			// Note: the child takes care of calculating its height.
-			int childWidthSpec = MeasureSpec.makeMeasureSpec(childWidth, MeasureSpec.EXACTLY);
-			int childHeightSpec = MeasureSpec.makeMeasureSpec(0,  MeasureSpec.UNSPECIFIED);
-			child.measure(childWidthSpec, childHeightSpec);
-			childHeight = child.getMeasuredHeight();
-		}
-
-		int vSpacing = 10;
-		try {
-			Field field = GridView.class.getDeclaredField("mVerticalSpacing");
-			field.setAccessible(true);
-			vSpacing = field.getInt(this);
-		} catch(Exception e) {
-
-		}
-
-		// Number of rows required to 'mTotal' items.
-		final int rows = (int) Math.ceil((double) getCount() / getNumColumnsCompat());
-		final int childrenHeight = childHeight * rows;
-		final int totalVerticalSpacing = rows > 0 ? (rows - 1) * vSpacing : 0;
-
-		// Total height of this view.
-		final int measuredHeight = Math.abs(childrenHeight + getPaddingTop() + getPaddingBottom() + totalVerticalSpacing);
-		setMeasuredDimension(measuredWidth, measuredHeight);
-	}
-
-	private int getNumColumnsCompat() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			return getNumColumnsCompat11();
-		} else {
-			int columns = 0;
-			int children = getChildCount();
-			if (children > 0) {
-				int width = getChildAt(0).getMeasuredWidth();
-				if (width > 0) {
-					columns = getWidth() / width;
-				}
-			}
-			return columns > 0 ? columns : AUTO_FIT;
-		}
-	}
-
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	private int getNumColumnsCompat11() {
-		return getNumColumns();
-	}
-}
diff --git a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java b/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
index f9c62121..bdcdc46f 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
@@ -23,6 +23,7 @@ import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Handler;
 import android.os.Looper;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -65,6 +66,8 @@ public class UpdateView extends LinearLayout {
 	protected SilentBackgroundTask<Void> imageTask = null;
 	
 	protected final boolean autoUpdate;
+	protected int position;
+	protected boolean checkable;
 	
 	public UpdateView(Context context) {
 		this(context, true);
@@ -224,8 +227,6 @@ public class UpdateView extends LinearLayout {
 			MusicDirectory.Entry check = null;
 			if(view instanceof SongView) {
 				check = ((SongView) view).getEntry();
-			} else if(view instanceof AlbumCell) {
-				check = ((AlbumCell) view).getEntry();
 			} else if(view instanceof AlbumView) {
 				check = ((AlbumView) view).getEntry();
 			}
@@ -283,4 +284,34 @@ public class UpdateView extends LinearLayout {
 			rating = isRated;
 		}
 	}
+
+	public void setPosition(int position) {
+		this.position = position;
+	}
+	public int getPosition() {
+		return position;
+	}
+
+	public boolean isCheckable() {
+		return checkable;
+	}
+
+	public static class UpdateViewHolder extends RecyclerView.ViewHolder {
+		private UpdateView updateView;
+
+		public UpdateViewHolder(UpdateView itemView) {
+			super(itemView);
+
+			this.updateView = itemView;
+		}
+
+		// Different is so that call is not ambiguous
+		public UpdateViewHolder(View view, boolean different) {
+			super(view);
+		}
+
+		public UpdateView getUpdateView() {
+			return updateView;
+		}
+	}
 }