allow to suppress grouping by returning null from getHeaderView

emilsjolander · Aug 10, 2013 · 9252a6f · 9252a6f
1 parent 62be7e8
commit 9252a6f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/library/src/com/emilsjolander/components/stickylistheaders/AdapterWrapper.java b/library/src/com/emilsjolander/components/stickylistheaders/AdapterWrapper.java
@@ -127,21 +127,20 @@ private void recycleHeaderIfExists(WrapperView wv) {
 	private View configureHeader(WrapperView wv, final int position) {
 		View header = wv.mHeader == null ? popHeader() : wv.mHeader;
 		header = mDelegate.getHeaderView(position, header, wv);
-		if (header == null) {
-			throw new NullPointerException("Header view must not be null.");
-		}
-		//if the header isn't clickable, the listselector will be drawn on top of the header
-		header.setClickable(true);
-		header.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				if(mOnHeaderClickListener != null){
-					long headerId = mDelegate.getHeaderId(position);
-					mOnHeaderClickListener.onHeaderClick(v, position, headerId);
+		if (header != null) {
+			//if the header isn't clickable, the listselector will be drawn on top of the header
+			header.setClickable(true);
+			header.setOnClickListener(new OnClickListener() {
+
+				@Override
+				public void onClick(View v) {
+					if(mOnHeaderClickListener != null){
+						long headerId = mDelegate.getHeaderId(position);
+						mOnHeaderClickListener.onHeaderClick(v, position, headerId);
+					}
 				}
-			}
-		});
+			});
+		}
 		return header;
 	}
 

diff --git a/library/src/com/emilsjolander/components/stickylistheaders/StickyListHeadersListView.java b/library/src/com/emilsjolander/components/stickylistheaders/StickyListHeadersListView.java
@@ -364,6 +364,7 @@ private void drawStickyHeader(Canvas canvas) {
 		canvas.restore();
 	}
 
+	@SuppressLint("NewApi")
 	private void measureHeader() {
 
 		int widthMeasureSpec = MeasureSpec.makeMeasureSpec(getWidth()
@@ -433,7 +434,8 @@ private void scrollChanged(int reportedFirstVisibleItem) {
 			mHeaderPosition = firstVisibleItem;
 			mCurrentHeaderId = mAdapter.getHeaderId(firstVisibleItem);
 			mHeader = mAdapter.getHeaderView(mHeaderPosition, mHeader, this);
-			measureHeader();
+			if (mHeader !=	null)
+				measureHeader();
 		}
 
 		int childCount = getChildCount();