Merge remote-tracking branch 'mflodin/checkable' into checkable

Support checkable item removal.

Conflicts:
	demo/res/layout/list_item_checkable.xml
	demo/src/com/mobeta/android/demodslv/MultipleChoiceListView.java
	library/src/com/mobeta/android/dslv/DragSortListView.java

Author: bauerca

demo/res/layout/list_item_checkable.xml

@@ -19,4 +19,10 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
     android:paddingLeft="8dp" />
+  <ImageView
+    android:id="@id/click_remove"
+    android:background="@drawable/delete_x"
+    android:layout_width="@dimen/item_height"
+    android:layout_height="@dimen/item_height"
+    android:layout_weight="0" />
 </com.mobeta.android.demodslv.CheckableLinearLayout>

demo/src/com/mobeta/android/demodslv/MultipleChoiceListView.java

@@ -8,6 +8,7 @@
 import android.widget.ArrayAdapter;
 
 import com.mobeta.android.dslv.DragSortListView;
+import com.mobeta.android.dslv.DragSortListView.RemoveListener;
 
 
 public class MultipleChoiceListView extends ListActivity
@@ -28,6 +29,17 @@ public void drop(int from, int to) {
             }
         };
 
+    private RemoveListener onRemove =
+        new DragSortListView.RemoveListener() {
+            @Override
+            public void remove(int which) {
+                DragSortListView list = getListView();
+                String item = adapter.getItem(which);
+                adapter.remove(item);
+                list.removeCheckState(which);
+            }
+        };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -42,6 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         DragSortListView list = getListView();
         list.setDropListener(onDrop);
+        list.setRemoveListener(onRemove);
    }
 
     @Override

library/src/com/mobeta/android/dslv/DragSortListView.java

@@ -1941,6 +1941,7 @@ private void measureItem(View item) {
         ViewGroup.LayoutParams lp = item.getLayoutParams();
         if (lp == null) {
             lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            item.setLayoutParams(lp);
         }
         int wspec = ViewGroup.getChildMeasureSpec(mWidthMeasureSpec, getListPaddingLeft() + getListPaddingRight(), lp.width);
         int hspec;
@@ -2500,6 +2501,40 @@ public void moveCheckState(int from, int to) {
         }
     }
 
+    /**
+     * Use this when an item has been deleted, to move the check state of all
+     * following items up one step. If you have a choiceMode which is not none,
+     * this method must be called when the order of items changes in an
+     * underlying adapter which does not have stable IDs (see
+     * {@link ListAdapter#hasStableIds()}). This is because without IDs, the
+     * ListView has no way of knowing which items have moved where, and cannot
+     * update the check state accordingly.
+     * 
+     * See also further comments on {@link #moveCheckState(int, int)}.
+     * 
+     * @param position
+     */
+    public void removeCheckState(int position) {
+        SparseBooleanArray cip = getCheckedItemPositions();
+        
+        if (cip.size() == 0)
+            return;
+        int[] runStart = new int[cip.size()];
+        int[] runEnd = new int[cip.size()];
+        int rangeStart = position;
+        int rangeEnd = cip.keyAt(cip.size()-1)+1;
+        int runCount = buildRunList(cip, rangeStart, rangeEnd, runStart, runEnd);
+        for (int i=0; i!=runCount; i++) {
+            if (!(runStart[i] == position || (runEnd[i] < runStart[i] && runEnd[i] > position))) {
+                // Only set a new check mark in front of this run if it does
+                // not contain the deleted position. If it does, we only need
+                // to make it one check mark shorter at the end.
+                setItemChecked(rotate(runStart[i], - 1, rangeStart, rangeEnd), true);
+            }
+            setItemChecked(rotate(runEnd[i], - 1, rangeStart, rangeEnd), false);
+        }
+    }
+
     private static int buildRunList(SparseBooleanArray cip, int rangeStart,
             int rangeEnd, int[] runStart, int[] runEnd) {
         int runCount = 0;

library/src/com/mobeta/android/dslv/SimpleFloatViewManager.java

@@ -6,6 +6,7 @@
 import android.widget.ListView;
 import android.widget.ImageView;
 import android.view.View;
+import android.view.ViewGroup;
 import android.util.Log;
 
 /**
@@ -59,6 +60,7 @@ public View onCreateFloatView(int position) {
         mImageView.setBackgroundColor(mFloatBGColor);
         mImageView.setPadding(0, 0, 0, 0);
         mImageView.setImageBitmap(mFloatBitmap);
+        mImageView.setLayoutParams(new ViewGroup.LayoutParams(v.getWidth(), v.getHeight()));
 
         return mImageView;
     }