Skip to content

Commit

Permalink
Fixed #269
Browse files Browse the repository at this point in the history
  • Loading branch information
@emilsjolander
emilsjolander committed Feb 17, 2014
1 parent 41c6b1d commit 66f8086
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 54 deletions.
Empty file modified gradlew
100644 → 100755
View file
Empty file.
11 changes: 0 additions & 11 deletions library/src/se/emilsjolander/stickylistheaders/ApiLevelTooLowException.java
View file

This file was deleted.

101 changes: 58 additions & 43 deletions library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.os.Build;
import android.os.Parcelable;
import android.util.AttributeSet;
import android.util.Log;
import android.util.SparseBooleanArray;
import android.view.View;
import android.view.ViewGroup;
Expand Down Expand Up @@ -613,6 +614,14 @@ public ListView getWrappedList() {
return mList;
}

private boolean requireSdkVersion(int versionCode) {
if (Build.VERSION.SDK_INT < versionCode) {
Log.e("StickyListHeaders", "Api lvl must be at least "+versionCode+" to call this method");
return false;
}
return true;
}

/* ---------- ListView delegate methods ---------- */

public void setAdapter(StickyListHeadersAdapter adapter) {
Expand Down Expand Up @@ -742,64 +751,74 @@ public void setHorizontalScrollBarEnabled(boolean horizontalScrollBarEnabled) {
@Override
@TargetApi(Build.VERSION_CODES.GINGERBREAD)
public int getOverScrollMode() {
requireSdkVersion(Build.VERSION_CODES.GINGERBREAD);
return mList.getOverScrollMode();
if (requireSdkVersion(Build.VERSION_CODES.GINGERBREAD)) {
return mList.getOverScrollMode();
}
return 0;
}

@Override
@TargetApi(Build.VERSION_CODES.GINGERBREAD)
public void setOverScrollMode(int mode) {
requireSdkVersion(Build.VERSION_CODES.GINGERBREAD);
if (mList != null) {
mList.setOverScrollMode(mode);
if (requireSdkVersion(Build.VERSION_CODES.GINGERBREAD)) {
if (mList != null) {
mList.setOverScrollMode(mode);
}
}
}

@TargetApi(Build.VERSION_CODES.FROYO)
public void smoothScrollBy(int distance, int duration) {
requireSdkVersion(Build.VERSION_CODES.FROYO);
mList.smoothScrollBy(distance, duration);
if (requireSdkVersion(Build.VERSION_CODES.FROYO)) {
mList.smoothScrollBy(distance, duration);
}
}

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public void smoothScrollByOffset(int offset) {
requireSdkVersion(Build.VERSION_CODES.HONEYCOMB);
mList.smoothScrollByOffset(offset);
if (requireSdkVersion(Build.VERSION_CODES.HONEYCOMB)) {
mList.smoothScrollByOffset(offset);
}
}

@SuppressLint("NewApi")
@TargetApi(Build.VERSION_CODES.FROYO)
public void smoothScrollToPosition(int position) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
mList.smoothScrollToPosition(position);
} else {
int offset = mAdapter == null ? 0 : getHeaderOverlap(position);
offset -= mClippingToPadding ? 0 : mPaddingTop;
mList.smoothScrollToPositionFromTop(position, offset);
if (requireSdkVersion(Build.VERSION_CODES.FROYO)) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
mList.smoothScrollToPosition(position);
} else {
int offset = mAdapter == null ? 0 : getHeaderOverlap(position);
offset -= mClippingToPadding ? 0 : mPaddingTop;
mList.smoothScrollToPositionFromTop(position, offset);
}
}
}

@TargetApi(Build.VERSION_CODES.FROYO)
public void smoothScrollToPosition(int position, int boundPosition) {
requireSdkVersion(Build.VERSION_CODES.FROYO);
mList.smoothScrollToPosition(position, boundPosition);
if (requireSdkVersion(Build.VERSION_CODES.FROYO)) {
mList.smoothScrollToPosition(position, boundPosition);
}
}

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public void smoothScrollToPositionFromTop(int position, int offset) {
requireSdkVersion(Build.VERSION_CODES.HONEYCOMB);
offset += mAdapter == null ? 0 : getHeaderOverlap(position);
offset -= mClippingToPadding ? 0 : mPaddingTop;
mList.smoothScrollToPositionFromTop(position, offset);
if (requireSdkVersion(Build.VERSION_CODES.HONEYCOMB)) {
offset += mAdapter == null ? 0 : getHeaderOverlap(position);
offset -= mClippingToPadding ? 0 : mPaddingTop;
mList.smoothScrollToPositionFromTop(position, offset);
}
}

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public void smoothScrollToPositionFromTop(int position, int offset,
int duration) {
requireSdkVersion(Build.VERSION_CODES.HONEYCOMB);
offset += mAdapter == null ? 0 : getHeaderOverlap(position);
offset -= mClippingToPadding ? 0 : mPaddingTop;
mList.smoothScrollToPositionFromTop(position, offset, duration);
if (requireSdkVersion(Build.VERSION_CODES.HONEYCOMB)) {
offset += mAdapter == null ? 0 : getHeaderOverlap(position);
offset -= mClippingToPadding ? 0 : mPaddingTop;
mList.smoothScrollToPositionFromTop(position, offset, duration);
}
}

public void setSelection(int position) {
Expand Down Expand Up @@ -842,14 +861,18 @@ public void setItemChecked(int position, boolean value) {

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public int getCheckedItemCount() {
requireSdkVersion(Build.VERSION_CODES.HONEYCOMB);
return mList.getCheckedItemCount();
if (requireSdkVersion(Build.VERSION_CODES.HONEYCOMB)) {
return mList.getCheckedItemCount();
}
return 0;
}

@TargetApi(Build.VERSION_CODES.FROYO)
public long[] getCheckedItemIds() {
requireSdkVersion(Build.VERSION_CODES.FROYO);
return mList.getCheckedItemIds();
if (requireSdkVersion(Build.VERSION_CODES.FROYO)) {
return mList.getCheckedItemIds();
}
return null;
}

public int getCheckedItemPosition() {
Expand Down Expand Up @@ -939,14 +962,11 @@ public void setFastScrollEnabled(boolean fastScrollEnabled) {
mList.setFastScrollEnabled(fastScrollEnabled);
}

/**
* @throws ApiLevelTooLowException on pre-Honeycomb device.
* @see android.widget.AbsListView#setFastScrollAlwaysVisible(boolean)
*/
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public void setFastScrollAlwaysVisible(boolean alwaysVisible) {
requireSdkVersion(Build.VERSION_CODES.HONEYCOMB);
mList.setFastScrollAlwaysVisible(alwaysVisible);
if (requireSdkVersion(Build.VERSION_CODES.HONEYCOMB)) {
mList.setFastScrollAlwaysVisible(alwaysVisible);
}
}

/**
Expand All @@ -969,20 +989,15 @@ public int getScrollBarStyle() {
return mList.getScrollBarStyle();
}

private void requireSdkVersion(int versionCode) {
if (Build.VERSION.SDK_INT < versionCode) {
throw new ApiLevelTooLowException(versionCode);
}
}

public int getPositionForView(View view) {
return mList.getPositionForView(view);
}

@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public void setMultiChoiceModeListener(MultiChoiceModeListener listener) {
requireSdkVersion(Build.VERSION_CODES.HONEYCOMB);
mList.setMultiChoiceModeListener(listener);
if (requireSdkVersion(Build.VERSION_CODES.HONEYCOMB)) {
mList.setMultiChoiceModeListener(listener);
}
}

@Override
Expand Down

0 comments on commit 66f8086

Please sign in to comment.