emilsjolander · Aug 10, 2013 · Oct 9, 2013 · Dec 8, 2013 · Jan 29, 2014 · Jan 29, 2014
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,11 @@
 buildscript {
     repositories {
-        mavenCentral()
+        google()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 
@@ -13,11 +14,12 @@ def isReleaseBuild() {
 }
 
 allprojects {
-    version = VERSION_NAME
     group = GROUP
 
     repositories {
+        google()
         mavenCentral()
+        jcenter()
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -12,3 +12,4 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=emilsjolander
 POM_DEVELOPER_NAME=Emil Sjolander
 POM_DEVELOPER_EMAIL=sjolander.emil@gmail.com
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Nov 19 08:36:06 CET 2013
+#Wed Sep 09 14:55:00 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -4,8 +4,4 @@
     android:versionCode="2"
     android:versionName="2.0" >
 
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="22" />
-
 </manifest>
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,9 +1,15 @@
 apply plugin: 'com.android.library'
 
-android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+dependencies {
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.customview:customview:1.1.0'
+}
 
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 14
+    }
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

diff --git a/library/src/se/emilsjolander/stickylistheaders/AdapterWrapper.java b/library/src/se/emilsjolander/stickylistheaders/AdapterWrapper.java
@@ -8,6 +8,7 @@
 import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.Checkable;
@@ -27,6 +28,7 @@ class AdapterWrapper extends BaseAdapter implements StickyListHeadersAdapter {
 
 	interface OnHeaderClickListener {
 		void onHeaderClick(View header, int itemPosition, long headerId);
+		boolean onHeaderLongClick(View header, int itemPosition, long headerId);
 	}
 
 	StickyListHeadersAdapter mDelegate;
@@ -135,12 +137,23 @@ private View configureHeader(WrapperView wv, final int position) {
 
 			@Override
 			public void onClick(View v) {
-				if(mOnHeaderClickListener != null){
+				if(mOnHeaderClickListener != null && position < getCount()){
 					long headerId = mDelegate.getHeaderId(position);
 					mOnHeaderClickListener.onHeaderClick(v, position, headerId);
 				}
 			}
 		});
+		header.setOnLongClickListener(new OnLongClickListener() {
+
+      @Override
+      public boolean onLongClick(View v) {
+        if(mOnHeaderClickListener != null && position < getCount()){
+          long headerId = mDelegate.getHeaderId(position);
+          return mOnHeaderClickListener.onHeaderLongClick(v, position, headerId);
+        }
+        return false;
+      }
+    });
 		return header;
 	}
 

diff --git a/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersAdapter.java b/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersAdapter.java
@@ -4,25 +4,33 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-
 import java.util.ArrayList;
 import java.util.List;
 
 
 /**
  * @author lsjwzh
  */
- class ExpandableStickyListHeadersAdapter extends BaseAdapter implements StickyListHeadersAdapter {
+class ExpandableStickyListHeadersAdapter extends BaseAdapter implements StickyListHeadersAdapter {
+
+    final StickyListHeadersAdapter mInnerAdapter;
+    private DualHashMap<View,Long> mViewToItemIdMap = new DualHashMap<>();
+    private DistinctMultiHashMap<Integer,View> mHeaderIdToViewMap = new DistinctMultiHashMap<>();
 
-    private final StickyListHeadersAdapter mInnerAdapter;
-    DualHashMap<View,Long> mViewToItemIdMap = new DualHashMap<View, Long>();
-    DistinctMultiHashMap<Integer,View> mHeaderIdToViewMap = new DistinctMultiHashMap<Integer, View>();
-    List<Long> mCollapseHeaderIds = new ArrayList<Long>();
+    private List<Long> mCollapseHeaderIds = new ArrayList<>();
 
     ExpandableStickyListHeadersAdapter(StickyListHeadersAdapter innerAdapter){
         this.mInnerAdapter = innerAdapter;
     }
 
+    public List<Long> getCollapseHeaderIds() {
+        return mCollapseHeaderIds;
+    }
+
+    public void setCollapseHeaderIds(List<Long> collapseHeaderIds) {
+        this.mCollapseHeaderIds = new ArrayList<>(collapseHeaderIds);
+    }
+
     @Override
     public View getHeaderView(int position, View convertView, ViewGroup parent) {
         return mInnerAdapter.getHeaderView(position,convertView,parent);
@@ -111,7 +119,7 @@ public boolean isHeaderCollapsed(long headerId){
 
     public void expand(long headerId) {
         if(isHeaderCollapsed(headerId)){
-            mCollapseHeaderIds.remove((Object) headerId);
+            mCollapseHeaderIds.remove(headerId);
         }
     }
 

diff --git a/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersListView.java b/library/src/se/emilsjolander/stickylistheaders/ExpandableStickyListHeadersListView.java
@@ -1,9 +1,12 @@
 package se.emilsjolander.stickylistheaders;
 
 import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.customview.view.AbsSavedState;
 import android.util.AttributeSet;
 import android.view.View;
-
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,8 +23,6 @@ public interface IAnimationExecutor{
 
     ExpandableStickyListHeadersAdapter mExpandableStickyListHeadersAdapter;
 
-
-
     IAnimationExecutor mDefaultAnimExecutor = new IAnimationExecutor() {
         @Override
         public void executeAnim(View target, int animType) {
@@ -53,7 +54,9 @@ public ExpandableStickyListHeadersAdapter getAdapter() {
 
     @Override
     public void setAdapter(StickyListHeadersAdapter adapter) {
-        mExpandableStickyListHeadersAdapter = new ExpandableStickyListHeadersAdapter(adapter);
+        mExpandableStickyListHeadersAdapter = (adapter instanceof SectionIndexingStickyListHeadersAdapter) ?
+            new SectionIndexingExpandableStickyListHeadersAdapter(((SectionIndexingStickyListHeadersAdapter) adapter)) :
+            new ExpandableStickyListHeadersAdapter(adapter);
         super.setAdapter(mExpandableStickyListHeadersAdapter);
     }
 
@@ -99,6 +102,14 @@ public boolean isHeaderCollapsed(long headerId){
         return  mExpandableStickyListHeadersAdapter.isHeaderCollapsed(headerId);
     }
 
+    public List<Long> getCollapsedHeaderIds() {
+        return mExpandableStickyListHeadersAdapter.getCollapseHeaderIds();
+    }
+
+    public void setCollapsedHeaderIds(List<Long> collapsedHeaderIds ) {
+        mExpandableStickyListHeadersAdapter.setCollapseHeaderIds(collapsedHeaderIds);
+    }
+
     public void setAnimExecutor(IAnimationExecutor animExecutor) {
         this.mDefaultAnimExecutor = animExecutor;
     }
@@ -123,4 +134,63 @@ private void animateView(final View target, final int type) {
 
     }
 
+    @Override
+    public Parcelable onSaveInstanceState() {
+        return new SavedState(super.onSaveInstanceState(), mExpandableStickyListHeadersAdapter.getCollapseHeaderIds());
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        SavedState ss = (SavedState) state;
+        super.onRestoreInstanceState(ss.getSuperState());
+        if (mExpandableStickyListHeadersAdapter != null) {
+            mExpandableStickyListHeadersAdapter.setCollapseHeaderIds(ss.collapsedHeaderIds);
+        }
+    }
+
+    static class SavedState extends AbsSavedState {
+        private List<Long> collapsedHeaderIds;
+
+        /**
+         * Constructor called from {@link StickyListHeadersListView#onSaveInstanceState()}
+         */
+        SavedState(Parcelable superState, List<Long> collapsedHeaderIds) {
+            super(superState);
+            this.collapsedHeaderIds = collapsedHeaderIds;
+        }
+
+        private void readValues(Parcel in, ClassLoader loader) {
+            collapsedHeaderIds = new ArrayList<>();
+            in.readList(collapsedHeaderIds, loader);
+        }
+
+        SavedState(Parcel in, ClassLoader loader) {
+            super(in, loader);
+            readValues(in, loader);
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            super.writeToParcel(out, flags);
+            out.writeList(collapsedHeaderIds);
+        }
+
+        public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel source, ClassLoader loader) {
+                return new SavedState(source, loader);
+            }
+
+            @Override
+            public SavedState createFromParcel(Parcel source) {
+                return createFromParcel(source, null);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+
 }
diff --git a/...se/emilsjolander/stickylistheaders/SectionIndexingExpandableStickyListHeadersAdapter.java b/...se/emilsjolander/stickylistheaders/SectionIndexingExpandableStickyListHeadersAdapter.java
@@ -0,0 +1,29 @@
+package se.emilsjolander.stickylistheaders;
+
+import android.widget.SectionIndexer;
+
+public class SectionIndexingExpandableStickyListHeadersAdapter extends ExpandableStickyListHeadersAdapter implements SectionIndexer {
+
+	SectionIndexingExpandableStickyListHeadersAdapter(SectionIndexingStickyListHeadersAdapter innerAdapter) {
+		super(innerAdapter);
+	}
+
+	@Override
+	public Object[] getSections() {
+		return getAdapter().getSections();
+	}
+
+	@Override
+	public int getPositionForSection(int sectionIndex) {
+		return getAdapter().getPositionForSection(sectionIndex);
+	}
+
+	@Override
+	public int getSectionForPosition(int position) {
+		return getAdapter().getSectionForPosition(position);
+	}
+
+	private SectionIndexingStickyListHeadersAdapter getAdapter() {
+		return ((SectionIndexingStickyListHeadersAdapter) mInnerAdapter);
+	}
+}
diff --git a/library/src/se/emilsjolander/stickylistheaders/SectionIndexingStickyListHeadersAdapter.java b/library/src/se/emilsjolander/stickylistheaders/SectionIndexingStickyListHeadersAdapter.java
@@ -0,0 +1,5 @@
+package se.emilsjolander.stickylistheaders;
+
+import android.widget.SectionIndexer;
+
+public interface SectionIndexingStickyListHeadersAdapter extends StickyListHeadersAdapter, SectionIndexer {}