revert changes

emilsjolander · Jan 29, 2014 · d505062 · d505062
1 parent 264d4b4
commit d505062
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 62 deletions.
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="7"
+        android:minSdkVersion="9"
         android:targetSdkVersion="17" />
 
 </manifest>
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,12 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-
 apply plugin: 'android-library'
 
 android {

diff --git a/library/src/com/emilsjolander/components/stickylistheaders/AdapterWrapper.java b/library/src/com/emilsjolander/components/stickylistheaders/AdapterWrapper.java
@@ -127,20 +127,21 @@ 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) {
-			//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) {
+			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);
+				}
+			}
+		});
 		return header;
 	}
 

diff --git a/library/src/com/emilsjolander/components/stickylistheaders/StickyListHeadersListView.java b/library/src/com/emilsjolander/components/stickylistheaders/StickyListHeadersListView.java
@@ -364,7 +364,6 @@ private void drawStickyHeader(Canvas canvas) {
 		canvas.restore();
 	}
 
-	@SuppressLint("NewApi")
 	private void measureHeader() {
 
 		int widthMeasureSpec = MeasureSpec.makeMeasureSpec(getWidth()
@@ -434,8 +433,7 @@ private void scrollChanged(int reportedFirstVisibleItem) {
 			mHeaderPosition = firstVisibleItem;
 			mCurrentHeaderId = mAdapter.getHeaderId(firstVisibleItem);
 			mHeader = mAdapter.getHeaderView(mHeaderPosition, mHeader, this);
-			if (mHeader !=	null)
-				measureHeader();
+			measureHeader();
 		}
 
 		int childCount = getChildCount();
@@ -569,42 +567,40 @@ public boolean isDrawingListUnderStickyHeader() {
 	// TODO handle touches better, multitouch etc.
 	@Override
 	public boolean onTouchEvent(MotionEvent ev) {
-	  if (mHeader != null) {	    
-  		int action = ev.getAction();
-  		if (action == MotionEvent.ACTION_DOWN
-  				&& ev.getY() <= mHeaderBottomPosition) {
-  			mHeaderDownY = ev.getY();
-  			mHeaderBeingPressed = true;
-  			mHeader.setPressed(true);
-  			mHeader.invalidate();
-  			invalidate(0, 0, getWidth(), mHeaderBottomPosition);
-  			return true;
-  		}
-  		if (mHeaderBeingPressed) {
-  			if (Math.abs(ev.getY() - mHeaderDownY) < mViewConfig
-  					.getScaledTouchSlop()) {
-  				if (action == MotionEvent.ACTION_UP
-  						|| action == MotionEvent.ACTION_CANCEL) {
-  					mHeaderDownY = -1;
-  					mHeaderBeingPressed = false;
-  					mHeader.setPressed(false);
-  					mHeader.invalidate();
-  					invalidate(0, 0, getWidth(), mHeaderBottomPosition);
-  					if (mOnHeaderClickListener != null) {
-  						mOnHeaderClickListener.onHeaderClick(this, mHeader,
-  								mHeaderPosition, mCurrentHeaderId, true);
-  					}
-  				}
-  				return true;
-  			} else {
-  				mHeaderDownY = -1;
-  				mHeaderBeingPressed = false;
-  				mHeader.setPressed(false);
-  				mHeader.invalidate();
-  				invalidate(0, 0, getWidth(), mHeaderBottomPosition);
-  			}
-  		}
-	  }
+		int action = ev.getAction();
+		if (action == MotionEvent.ACTION_DOWN
+				&& ev.getY() <= mHeaderBottomPosition) {
+			mHeaderDownY = ev.getY();
+			mHeaderBeingPressed = true;
+			mHeader.setPressed(true);
+			mHeader.invalidate();
+			invalidate(0, 0, getWidth(), mHeaderBottomPosition);
+			return true;
+		}
+		if (mHeaderBeingPressed) {
+			if (Math.abs(ev.getY() - mHeaderDownY) < mViewConfig
+					.getScaledTouchSlop()) {
+				if (action == MotionEvent.ACTION_UP
+						|| action == MotionEvent.ACTION_CANCEL) {
+					mHeaderDownY = -1;
+					mHeaderBeingPressed = false;
+					mHeader.setPressed(false);
+					mHeader.invalidate();
+					invalidate(0, 0, getWidth(), mHeaderBottomPosition);
+					if (mOnHeaderClickListener != null) {
+						mOnHeaderClickListener.onHeaderClick(this, mHeader,
+								mHeaderPosition, mCurrentHeaderId, true);
+					}
+				}
+				return true;
+			} else {
+				mHeaderDownY = -1;
+				mHeaderBeingPressed = false;
+				mHeader.setPressed(false);
+				mHeader.invalidate();
+				invalidate(0, 0, getWidth(), mHeaderBottomPosition);
+			}
+		}
 		return super.onTouchEvent(ev);
 	}