Fixed a couple bugs with small datasets

Author: Iain Connor

app/src/main/java/com/tippingcanoe/dewey/app/DemoAdapter.java

@@ -2,6 +2,8 @@
 
 import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,6 +24,12 @@ public DemoAdapter () {
 	@Override
 	public DeweyViewHolder onCreateViewHolder ( ViewGroup parent, int viewType ) {
 		View deweyCell = LayoutInflater.from(parent.getContext()).inflate(R.layout.dewey_cell, parent, false);
+
+		//TextView deweyCell = new TextView(parent.getContext());
+		//deweyCell.setLayoutParams(new RecyclerView.LayoutParams(40, ViewGroup.LayoutParams.MATCH_PARENT));
+		//deweyCell.setGravity(Gravity.CENTER_HORIZONTAL);
+		//deweyCell.setPadding(0, 10, 0, 10);
+
 		return new DeweyViewHolder(deweyCell);
 	}
 
@@ -32,7 +40,7 @@ public void onBindViewHolder ( DeweyViewHolder holder, int position ) {
 
 	@Override
 	public int getItemCount () {
-		return 50;//return sentances.size();
+		return 2;//return sentances.size();
 	}
 
 	protected List<String> getRandomSentances () {

library/src/main/java/com/tippingcanoe/dewey/DeweyDecorator.java

@@ -396,7 +396,7 @@ protected void drawStrip ( RecyclerView parent, Canvas c, int firstVisiblePos, i
 		if ((stripPosition == 0 && headerView != null) || (stripPosition == footerPos && footerView != null) || (stripPosition >= firstVisiblePos && stripPosition <= lastVisiblePos)) {
 			View currentFocusedChild;
 
-			if (stripPosition == 0) {
+			if (stripPosition == 0 && headerView != null) {
 				currentFocusedChild = headerView;
 			} else if (stripPosition == footerPos && footerView != null) {
 				currentFocusedChild = footerView;

library/src/main/java/com/tippingcanoe/dewey/DeweyLayoutManager.java

@@ -11,6 +11,8 @@
 class DeweyLayoutManager extends LinearLayoutManager {
 	boolean uniformCells = false;
 	int uniformCellWidth = 0;
+	int forcedCellWidth = 0;
+
 	/**
 	 * Creates a vertical LinearLayoutManager
 	 *
@@ -91,15 +93,14 @@ protected int measureFirstChildHeightAndObtainWidth(RecyclerView.Recycler recycl
 
 			detachView(view);
 
+			updateForcedCellWidth();
+
 			return height;
 		}
 
 		return 0;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public RecyclerView.LayoutParams generateDefaultLayoutParams() {
 		return updateLayoutParamsForUniformWidthIfNeeded(super.generateDefaultLayoutParams());
@@ -116,9 +117,14 @@ public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet at
 		return updateLayoutParamsForUniformWidthIfNeeded(super.generateLayoutParams(c, attrs));
 	}
 
+	@Override
+	public boolean checkLayoutParams(RecyclerView.LayoutParams lp) {
+		return super.checkLayoutParams(lp) && (forcedCellWidth == 0 || lp.width == forcedCellWidth);
+	}
+
 	protected RecyclerView.LayoutParams updateLayoutParamsForUniformWidthIfNeeded ( RecyclerView.LayoutParams layoutParams ) {
-		if ( uniformCells && uniformCellWidth != 0 && (uniformCellWidth * getItemCount()) < getWidth() ) {
-			layoutParams.width = (int) ((float) getWidth() / (float) getItemCount());
+		if ( forcedCellWidth != 0 ) {
+			layoutParams.width = forcedCellWidth;
 		}
 
 		return layoutParams;
@@ -134,5 +140,12 @@ public int getUniformCellWidth() {
 
 	public void setUniformCells(boolean uniformCells) {
 		this.uniformCells = uniformCells;
+		updateForcedCellWidth();
+	}
+
+	protected void updateForcedCellWidth () {
+		if ( uniformCells && uniformCellWidth != 0 && (uniformCellWidth * getItemCount()) < getWidth() ) {
+			forcedCellWidth = (int) ((float) getWidth() / (float) getItemCount());
+		}
 	}
 }