pendingDismisses) {
- ViewGroup.LayoutParams lp;
- for (final PendingDismissData pendingDismiss : pendingDismisses) {
- // Reset view presentation
- ViewHelper.setAlpha(pendingDismiss.view, 1f);
- ViewHelper.setTranslationX(pendingDismiss.view, 0);
- lp = pendingDismiss.view.getLayoutParams();
- lp.height = 0;
- pendingDismiss.view.setLayoutParams(lp);
- }
- }
-
- protected void finalizeDismiss() {
- --mDismissAnimationRefCount;
- if (mDismissAnimationRefCount == 0) {
- // No active animations, process all pending dismisses.
- // Sort by descending position
- Collections.sort(mPendingDismisses);
-
- int[] dismissPositions = new int[mPendingDismisses.size()];
- for (int i = mPendingDismisses.size() - 1; i >= 0; i--) {
- dismissPositions[i] = mPendingDismisses.get(i).position;
- }
- mCallback.onDismiss(mListView, dismissPositions);
-
- recycleDismissedViewsItems(mPendingDismisses);
-
- mPendingDismisses.clear();
- }
- }
-
- void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
- mIsParentHorizontalScrollContainer = mResIdOfTouchChild == 0 && isParentHorizontalScrollContainer;
- }
-
- void setTouchChild(final int childResId) {
- mResIdOfTouchChild = childResId;
- if (childResId != 0) {
- setIsParentHorizontalScrollContainer(false);
- }
- }
-
- public void notifyDataSetChanged() {
- mVirtualListCount = mListView.getAdapter().getCount();
- }
-}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnScrollListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnScrollListener.java
deleted file mode 100644
index f5ea2372..00000000
--- a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnScrollListener.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * External default OnScrollListener allowing to custom onScrollListening events like loading more items.
- * Author: David Berlioz
- */
-
-package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss;
-
-import android.widget.AbsListView;
-
-/**
- * An {@link android.widget.AbsListView.OnScrollListener} that is used in conjunction with {@link com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeDismissAdapter}. Override this class to
- * provide a custom implementation of the OnScrollListener. Do not forget to call super on the overridden methods!
- */
-public class SwipeOnScrollListener implements AbsListView.OnScrollListener {
-
- private SwipeDismissListViewTouchListener mTouchListener;
-
- public void setTouchListener(final SwipeDismissListViewTouchListener touchListener) {
- mTouchListener = touchListener;
- }
-
- @Override
- public void onScrollStateChanged(final AbsListView view, final int scrollState) {
- if (scrollState != AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
- mTouchListener.disallowSwipe();
- }
- }
-
- @Override
- public void onScroll(final AbsListView view, final int firstVisibleItem, final int visibleItemCount, final int totalItemCount) {
- }
-}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnTouchListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnTouchListener.java
deleted file mode 100644
index c06b29bf..00000000
--- a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnTouchListener.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2013 K–NFB Reading Technology, Inc.
- */
-
-package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss;
-
-import android.view.View;
-
-/**
- * An OnTouchListener that should be used when list-view items can be swiped horizontally.
- * @author Anton Spaans on 9/12/13.
- */
-public interface SwipeOnTouchListener extends View.OnTouchListener {
- /**
- * @return true if the user is currently swiping a list-item horizontally.
- */
- public boolean isSwiping();
-}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoAdapter.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoAdapter.java
deleted file mode 100644
index b13965e4..00000000
--- a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoAdapter.java
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Copyright 2013 Frankie Sardo
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.nhaarman.listviewanimations.BaseAdapterDecorator;
-import com.nhaarman.listviewanimations.util.AdapterViewUtil;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
-import static com.nineoldandroids.view.ViewHelper.setAlpha;
-import static com.nineoldandroids.view.ViewHelper.setTranslationX;
-import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
-
-/**
- * Warning: a stable id for each item in the adapter is required. The decorated
- * adapter should not try to cast convertView to a particular view. The
- * undoLayout should have the same height as the content row.
- *
- * Usage:
- * * Create a new instance of this class providing the {@link BaseAdapter} to wrap, the undo layout, the undo button id and a {@link DeleteItemCallback}, optionally a delay time millis,
- * a count down TextView res id,
- * , a delay in milliseconds before deleting the item.
- * * Set your {@link ListView} to this ContextualUndoAdapter, and set this ContextualUndoAdapter to your ListView.
- */
-@SuppressWarnings("UnusedDeclaration")
-public class ContextualUndoAdapter extends BaseAdapterDecorator implements ContextualUndoListViewTouchListener.Callback {
-
- private static final int ANIMATION_DURATION = 150;
- private static final String EXTRA_ACTIVE_REMOVED_ID = "removedId";
- private static final String X = "x";
-
- private final int mUndoLayoutId;
- private final int mUndoActionId;
- private final int mCountDownTextViewResId;
- private final int mAutoDeleteDelayMillis;
-
- private long mDismissStartMillis;
-
- private ContextualUndoView mCurrentRemovedView;
- private long mCurrentRemovedId;
-
- private final Handler mHandler;
- private final CountDownRunnable mCountDownRunnable;
-
- private final DeleteItemCallback mDeleteItemCallback;
- private final CountDownFormatter mCountDownFormatter;
-
- private ContextualUndoListViewTouchListener mContextualUndoListViewTouchListener;
-
- /**
- * Create a new ContextualUndoAdapter based on given parameters.
- *
- * @param baseAdapter The {@link BaseAdapter} to wrap
- * @param undoLayoutId The layout resource id to show as undo
- * @param undoActionId The id of the component which undoes the dismissal
- * @param deleteItemCallback The {@link DeleteItemCallback} which is called when an item should be deleted from your collection.
- */
- public ContextualUndoAdapter(final BaseAdapter baseAdapter, final int undoLayoutId, final int undoActionId, final DeleteItemCallback deleteItemCallback) {
- this(baseAdapter, undoLayoutId, undoActionId, -1, -1, deleteItemCallback, null);
- }
-
- /**
- * Create a new ContextualUndoAdapter based on given parameters.
- * Will automatically remove the swiped item after autoDeleteTimeMillis milliseconds.
- *
- * @param baseAdapter The {@link BaseAdapter} to wrap
- * @param undoLayoutResId The layout resource id to show as undo
- * @param undoActionResId The id of the component which undoes the dismissal
- * @param autoDeleteTimeMillis The time in milliseconds that the adapter will wait for he user to hit undo before automatically deleting the item
- * @param deleteItemCallback The {@link DeleteItemCallback} which is called when an item should be deleted from your collection.
- */
- public ContextualUndoAdapter(final BaseAdapter baseAdapter, final int undoLayoutResId, final int undoActionResId, final int autoDeleteTimeMillis, final DeleteItemCallback deleteItemCallback) {
- this(baseAdapter, undoLayoutResId, undoActionResId, autoDeleteTimeMillis, -1, deleteItemCallback, null);
- }
-
- /**
- * Create a new ContextualUndoAdapter based on given parameters.
- * Will automatically remove the swiped item after autoDeleteTimeMillis milliseconds.
- *
- * @param baseAdapter The {@link BaseAdapter} to wrap
- * @param undoLayoutResId The layout resource id to show as undo
- * @param undoActionResId The resource id of the component which undoes the dismissal
- * @param autoDeleteTime The time in milliseconds that adapter will wait for user to hit undo before automatically deleting item
- * @param countDownTextViewResId The resource id of the {@link TextView} in the undoLayoutResId that will show the time left
- * @param deleteItemCallback The {@link DeleteItemCallback} which is called when an item should be deleted from your collection.
- * @param countDownFormatter The {@link CountDownFormatter} which provides text to be shown in the {@link TextView} as specified by countDownTextViewResId
- */
- public ContextualUndoAdapter(final BaseAdapter baseAdapter, final int undoLayoutResId, final int undoActionResId, final int autoDeleteTime, final int countDownTextViewResId,
- final DeleteItemCallback deleteItemCallback, final CountDownFormatter countDownFormatter) {
- super(baseAdapter);
-
- mHandler = new Handler();
- mCountDownRunnable = new CountDownRunnable();
-
- mUndoLayoutId = undoLayoutResId;
- mUndoActionId = undoActionResId;
- mCurrentRemovedId = -1;
- mAutoDeleteDelayMillis = autoDeleteTime;
- mCountDownTextViewResId = countDownTextViewResId;
-
- mDeleteItemCallback = deleteItemCallback;
- mCountDownFormatter = countDownFormatter;
- }
-
- @Override
- public final View getView(final int position, final View convertView, final ViewGroup parent) {
- final ViewHolder vh;
- ContextualUndoView contextualUndoView = (ContextualUndoView) convertView;
- if (contextualUndoView == null) {
- contextualUndoView = new ContextualUndoView(parent.getContext(), mUndoLayoutId, mCountDownTextViewResId);
- contextualUndoView.findViewById(mUndoActionId).setOnClickListener(new UndoListener(contextualUndoView));
- vh = new ViewHolder(contextualUndoView);
- } else {
- vh = ViewHolder.getViewHolder(contextualUndoView);
- }
-
- View contentView = super.getView(position, contextualUndoView.getContentView(), contextualUndoView);
- contextualUndoView.updateContentView(contentView);
-
- long itemId = getItemId(position);
- vh.mItemId = itemId;
-
- if (itemId == mCurrentRemovedId) {
- contextualUndoView.displayUndo();
- long millisLeft = mAutoDeleteDelayMillis - (System.currentTimeMillis() - mDismissStartMillis);
- if (mCountDownFormatter != null) {
- contextualUndoView.updateCountDownTimer(mCountDownFormatter.getCountDownString(millisLeft));
- }
- } else {
- contextualUndoView.displayContentView();
- }
-
- contextualUndoView.setItemId(itemId);
- return contextualUndoView;
- }
-
- @Override
- public void setAbsListView(final AbsListView listView) {
- super.setAbsListView(listView);
- mContextualUndoListViewTouchListener = new ContextualUndoListViewTouchListener(listView, this);
- mContextualUndoListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer());
- mContextualUndoListViewTouchListener.setTouchChild(getTouchChild());
- listView.setOnTouchListener(mContextualUndoListViewTouchListener);
- listView.setOnScrollListener(mContextualUndoListViewTouchListener.makeScrollListener());
- listView.setOnHierarchyChangeListener(new HierarchyChangeListener());
- }
-
- @Override
- public void onViewSwiped(final long dismissViewItemId, final int dismissPosition) {
- ContextualUndoView contextualUndoView = getContextualUndoView(dismissViewItemId);
- if (contextualUndoView == null) {
- removePreviousContextualUndoIfPresent();
- mCurrentRemovedView = null;
- mCurrentRemovedId = dismissViewItemId;
- } else if (contextualUndoView.isContentDisplayed()) {
- restoreViewPosition(contextualUndoView);
- contextualUndoView.displayUndo();
- removePreviousContextualUndoIfPresent();
- setCurrentRemovedView(contextualUndoView);
-
- if (mAutoDeleteDelayMillis > 0) {
- startAutoDeleteTimer();
- }
- } else {
- performRemovalIfNecessary();
- }
- }
-
- private ContextualUndoView getContextualUndoView(final long dismissViewItemId) {
- ContextualUndoView contextualUndoView = null;
-
- AbsListView listView = getAbsListView();
- int childCount = listView.getChildCount();
- for (int i = 0; i < childCount; i++) {
- View child = listView.getChildAt(i);
- if (child instanceof ContextualUndoView) {
- ContextualUndoView listItem = (ContextualUndoView) child;
- if (listItem.getItemId() == dismissViewItemId) {
- contextualUndoView = listItem;
- }
- }
- }
- return contextualUndoView;
- }
-
- private void startAutoDeleteTimer() {
- mHandler.removeCallbacks(mCountDownRunnable);
-
- if (mCountDownFormatter != null) {
- mCurrentRemovedView.updateCountDownTimer(mCountDownFormatter.getCountDownString(mAutoDeleteDelayMillis));
- }
-
- mDismissStartMillis = System.currentTimeMillis();
- mHandler.postDelayed(mCountDownRunnable, Math.min(1000, mAutoDeleteDelayMillis));
- }
-
- private void restoreViewPosition(final View view) {
- setAlpha(view, 1f);
- setTranslationX(view, 0);
- }
-
- private void removePreviousContextualUndoIfPresent() {
- if (mCurrentRemovedView != null) {
- performRemovalIfNecessary();
- }
- }
-
- private void setCurrentRemovedView(final ContextualUndoView currentRemovedView) {
- mCurrentRemovedView = currentRemovedView;
- mCurrentRemovedId = currentRemovedView.getItemId();
- }
-
- private void clearCurrentRemovedView() {
- mCurrentRemovedView = null;
- mCurrentRemovedId = -1;
- mHandler.removeCallbacks(mCountDownRunnable);
- }
-
- @Override
- public void onListScrolled() {
- performRemovalIfNecessary();
- }
-
- private void performRemovalIfNecessary() {
- if (mCurrentRemovedId == -1) {
- return;
- }
-
- ContextualUndoView currentRemovedView = getCurrentRemovedView(mCurrentRemovedView, mCurrentRemovedId);
- if (currentRemovedView != null) {
- ValueAnimator animator = ValueAnimator.ofInt(currentRemovedView.getHeight(), 1).setDuration(ANIMATION_DURATION);
-
- RemoveViewAnimatorListenerAdapter listener = new RemoveViewAnimatorListenerAdapter(currentRemovedView, mCurrentRemovedId);
- RemoveViewAnimatorUpdateListener updateListener = new RemoveViewAnimatorUpdateListener(listener);
-
- animator.addListener(listener);
- animator.addUpdateListener(updateListener);
- animator.start();
- } else {
- // The hard way.
- deleteItemGivenId(mCurrentRemovedId);
- }
- clearCurrentRemovedView();
- }
-
- private void deleteItemGivenId(final long deleteItemId) {
- int position = -1;
- int numItems = getCount();
- for (int i = 0; i < numItems; i++) {
- long itemId = getItemId(i);
- if (itemId == deleteItemId) {
- position = i;
- break;
- }
- }
-
- if (position >= 0) {
- mDeleteItemCallback.deleteItem(position);
- }
- }
-
- private ContextualUndoView getCurrentRemovedView(final ContextualUndoView currentRemovedView, final long itemId) {
- ContextualUndoView result = currentRemovedView;
- if (result == null ||
- result.getParent() == null ||
- result.getItemId() != itemId ||
- AdapterViewUtil.getPositionForView(getAbsListView(), result) < 0) {
- result = getContextualUndoView(itemId);
- }
- return result;
- }
-
- /**
- * This method should be called in your {@link Activity}'s {@link Activity#onSaveInstanceState(Bundle)} to remember dismissed statuses.
- * @param outState the {@link Bundle} provided by Activity.onSaveInstanceState(Bundle).
- */
- public void onSaveInstanceState(final Bundle outState) {
- outState.putLong(EXTRA_ACTIVE_REMOVED_ID, mCurrentRemovedId);
- }
-
- /**
- * This method should be called in your {@link Activity#onRestoreInstanceState(Bundle)} to remember dismissed statuses.
- */
- public void onRestoreInstanceState(final Bundle savedInstanceState) {
- if (savedInstanceState != null) {
- mCurrentRemovedId = savedInstanceState.getLong(EXTRA_ACTIVE_REMOVED_ID, -1);
- }
- }
-
- /**
- * Animate the item at given position away and show the undo {@link View}.
- * @param position the position.
- */
- public void swipeViewAtPosition(final int position) {
- mCurrentRemovedId = getItemId(position);
- for (int i = 0; i < getAbsListView().getChildCount(); i++) {
- AbsListView absListView = getAbsListView();
- View childView = absListView.getChildAt(i);
- int positionForView = AdapterViewUtil.getPositionForView(absListView, childView);
- if (positionForView == position) {
- swipeView(childView, positionForView);
- }
- }
- }
-
- private void swipeView(final View view, final int dismissPosition) {
- ObjectAnimator animator = ObjectAnimator.ofFloat(view, X, view.getMeasuredWidth());
- animator.addListener(new AnimatorListenerAdapter() {
-
- @Override
- public void onAnimationEnd(final Animator animator) {
- onViewSwiped(((ContextualUndoView) view).getItemId(), dismissPosition);
- }
- });
- animator.start();
- }
-
- @Override
- public void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
- super.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
- if (mContextualUndoListViewTouchListener != null) {
- mContextualUndoListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
- }
- }
-
- @Override
- public void setTouchChild(final int childResId) {
- super.setTouchChild(childResId);
- if (mContextualUndoListViewTouchListener != null) {
- mContextualUndoListViewTouchListener.setTouchChild(childResId);
- }
- }
-
- /**
- * Removes any item that was swiped away.
- * @param animate If true, animates the removal (collapsing the item).
- * If false, removes item immediately without animation.
- * @deprecated use {@link #removePendingItem()} or {@link #animateRemovePendingItem()} instead.
- */
- @Deprecated
- public void removePendingItem(final boolean animate) {
- if (animate) {
- animateRemovePendingItem();
- } else {
- removePendingItem();
- }
- }
-
- /**
- * Cancels the count down, and removes any item that was swiped away, without animating. Will cause {@link DeleteItemCallback#deleteItem(int)} to be called.
- */
- public void removePendingItem() {
- if (mCurrentRemovedView != null || mCurrentRemovedId >= 0) {
- new RemoveViewAnimatorListenerAdapter(mCurrentRemovedView, mCurrentRemovedId).onAnimationEnd(null);
- clearCurrentRemovedView();
- }
- }
-
- /**
- * Removes any item that was swiped away, animating the removal (collapsing the item). {@link DeleteItemCallback#deleteItem(int)} to be called.
- */
- public void animateRemovePendingItem() {
- removePreviousContextualUndoIfPresent();
- }
-
- /**
- * Cancel the count down. This will not cause the {@link DeleteItemCallback#deleteItem(int)} to be called. Use {@link #removePendingItem()} for that instead.
- */
- public void cancelCountDown() {
- mHandler.removeCallbacks(mCountDownRunnable);
- }
-
- /**
- * A callback interface which is used to notify when items should be removed from the collection.
- */
- public interface DeleteItemCallback {
- /**
- * Called when an item should be removed from the collection.
- *
- * @param position
- * the position of the item that should be removed.
- */
- public void deleteItem(int position);
- }
-
- /**
- * A callback interface which is used to provide the text to display when counting down.
- */
- public interface CountDownFormatter {
- /**
- * Called each tick of the CountDownTimer
- * @param millisLeft time in milliseconds remaining before the item is automatically removed
- */
- public String getCountDownString(final long millisLeft);
- }
-
- private class CountDownRunnable implements Runnable {
-
- @Override
- public void run() {
- long millisRemaining = mAutoDeleteDelayMillis - (System.currentTimeMillis() - mDismissStartMillis);
- if (mCountDownFormatter != null) {
- mCurrentRemovedView.updateCountDownTimer(mCountDownFormatter.getCountDownString(millisRemaining));
- }
-
- if (millisRemaining <= 0) {
- performRemovalIfNecessary();
- } else {
- mHandler.postDelayed(this, Math.min(millisRemaining, 1000));
- }
- }
- }
-
- private class RemoveViewAnimatorListenerAdapter extends AnimatorListenerAdapter {
-
- private ContextualUndoView mDismissView;
- private final long mDismissViewId;
- private final int mOriginalHeight;
-
- public RemoveViewAnimatorListenerAdapter(final ContextualUndoView dismissView, final long dismissViewId) {
- mDismissView = dismissView;
- mDismissViewId = dismissViewId;
- mOriginalHeight = dismissView.getHeight();
- }
-
- @Override
- public void onAnimationEnd(final Animator animation) {
- mDismissView = getViewBeingAnimated();
- if (mDismissView == null) {
- deleteItemGivenId(mDismissViewId);
- return;
- }
-
- restoreViewPosition(mDismissView);
- restoreViewDimension(mDismissView);
- deleteCurrentItem(mDismissView);
- }
-
- private void restoreViewDimension(final View view) {
- ViewGroup.LayoutParams lp;
- lp = view.getLayoutParams();
- lp.height = mOriginalHeight;
- view.setLayoutParams(lp);
- }
-
- private void deleteCurrentItem(final View view) {
- int position = AdapterViewUtil.getPositionForView(getAbsListView(), view);
- mDeleteItemCallback.deleteItem(position);
- }
-
- private ContextualUndoView getViewBeingAnimated() {
- ContextualUndoView newDismissView = getCurrentRemovedView(mDismissView, mDismissViewId);
- if (newDismissView != mDismissView) {
- restoreViewPosition(mDismissView);
- restoreViewDimension(mDismissView);
-
- mDismissView = newDismissView;
- }
- return mDismissView;
- }
- }
-
- private class RemoveViewAnimatorUpdateListener implements ValueAnimator.AnimatorUpdateListener {
-
- final RemoveViewAnimatorListenerAdapter mParentAdapter;
- private final ViewGroup.LayoutParams mLayoutParams;
-
- public RemoveViewAnimatorUpdateListener(final RemoveViewAnimatorListenerAdapter parentAdapter) {
- mParentAdapter = parentAdapter;
- mLayoutParams = parentAdapter.mDismissView.getLayoutParams();
- }
-
- @Override
- public void onAnimationUpdate(final ValueAnimator valueAnimator) {
- ContextualUndoView dismissView = mParentAdapter.getViewBeingAnimated();
- if (dismissView != null) {
- mLayoutParams.height = (Integer) valueAnimator.getAnimatedValue();
- dismissView.setLayoutParams(mLayoutParams);
- }
- }
- }
-
- private class UndoListener implements View.OnClickListener {
-
- private final ContextualUndoView mContextualUndoView;
-
- public UndoListener(final ContextualUndoView contextualUndoView) {
- mContextualUndoView = contextualUndoView;
- }
-
- @Override
- public void onClick(final View v) {
- clearCurrentRemovedView();
- mContextualUndoView.displayContentView();
- moveViewOffScreen();
- animateViewComingBack();
- }
-
- private void moveViewOffScreen() {
- ViewHelper.setTranslationX(mContextualUndoView, mContextualUndoView.getWidth());
- }
-
- private void animateViewComingBack() {
- animate(mContextualUndoView).translationX(0).setDuration(ANIMATION_DURATION).setListener(null);
- }
- }
-
- private class HierarchyChangeListener implements ViewGroup.OnHierarchyChangeListener {
- @Override
- public void onChildViewAdded(final View parent, final View child) {
- final ViewHolder vh = ViewHolder.getViewHolder(child);
- if (vh != null && mCurrentRemovedId > 0 && vh.mItemId == mCurrentRemovedId) {
- mCurrentRemovedView = (ContextualUndoView) child;
- }
- }
-
- @Override
- public void onChildViewRemoved(final View parent, final View child) {
- final ViewHolder vh = ViewHolder.getViewHolder(child);
- if (vh != null && mCurrentRemovedId > 0 && vh.mItemId == mCurrentRemovedId) {
- mCurrentRemovedView = null;
- }
- }
- }
-
- private static class ViewHolder {
- final ContextualUndoView mContextualUndoView;
-
- long mItemId;
-
- static ViewHolder getViewHolder(final View view) {
- return (ViewHolder) view.getTag();
- }
-
- ViewHolder(final ContextualUndoView contextualUndoView) {
- mContextualUndoView = contextualUndoView;
- mContextualUndoView.setTag(this);
- }
- }
-}
\ No newline at end of file
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoListViewTouchListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoListViewTouchListener.java
deleted file mode 100644
index 8a82433b..00000000
--- a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoListViewTouchListener.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright 2012 Roman Nurik
- * Copyright 2013 Frankie Sardo
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo;
-
-import android.graphics.Rect;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.View.OnTouchListener;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-
-import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.DismissableManager;
-import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeOnTouchListener;
-import com.nhaarman.listviewanimations.util.AdapterViewUtil;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-
-import static com.nineoldandroids.view.ViewHelper.setAlpha;
-import static com.nineoldandroids.view.ViewHelper.setTranslationX;
-import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
-
-/**
- * An {@link OnTouchListener} for the {@link ContextualUndoAdapter}. Don't use
- * this class directly, use ContextualUndoAdapter to wrap your
- * {@link BaseAdapter}s.
- */
-public class ContextualUndoListViewTouchListener implements SwipeOnTouchListener {
- // Cached ViewConfiguration and system-wide constant values
- private final int mSlop;
- private final int mMinFlingVelocity;
- private final int mMaxFlingVelocity;
- private final long mAnimationTime;
-
- // Fixed properties
- private final AbsListView mListView;
- private final Callback mCallback;
- private int mViewWidth = 1; // 1 and not 0 to prevent dividing by zero
-
- // Transient properties
- private float mDownX;
- private float mDownY;
- private boolean mSwiping;
- private VelocityTracker mVelocityTracker;
- private int mDownPosition;
- private View mDownView;
- private boolean mPaused;
- private boolean mDisallowSwipe;
-
- private boolean mIsParentHorizontalScrollContainer;
- private int mResIdOfTouchChild;
- private boolean mTouchChildTouched;
-
- private DismissableManager mDismissableManager;
-
- public interface Callback {
-
- void onViewSwiped(long dismissViewItemId, int dismissPosition);
-
- void onListScrolled();
- }
-
- public ContextualUndoListViewTouchListener(final AbsListView listView, final Callback callback) {
- ViewConfiguration vc = ViewConfiguration.get(listView.getContext());
- mSlop = vc.getScaledTouchSlop();
- mMinFlingVelocity = vc.getScaledMinimumFlingVelocity();
- mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();
- mAnimationTime = listView.getContext().getResources().getInteger(android.R.integer.config_shortAnimTime);
- mListView = listView;
- mCallback = callback;
- }
-
- public void setEnabled(final boolean enabled) {
- mPaused = !enabled;
- }
-
- /**
- * Set the {@link com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.DismissableManager} to specify which views can or cannot be swiped.
- * @param dismissableManager null for no restrictions.
- */
- @SuppressWarnings("UnusedDeclaration")
- public void setDismissableManager(final DismissableManager dismissableManager) {
- mDismissableManager = dismissableManager;
- }
-
- public AbsListView.OnScrollListener makeScrollListener() {
- return new AbsListView.OnScrollListener() {
- @Override
- public void onScrollStateChanged(final AbsListView absListView, final int scrollState) {
- setEnabled(scrollState != AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);
- if (mPaused) {
- mCallback.onListScrolled();
- }
- if (scrollState != AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
- mDisallowSwipe = true;
- }
-
- }
-
- @Override
- public void onScroll(final AbsListView absListView, final int firstVisibleItem, final int visibleItemCount,
- final int totalItemCount) {
- }
- };
- }
-
- @Override
- public boolean onTouch(final View view, final MotionEvent motionEvent) {
- if (mViewWidth < 2) {
- mViewWidth = mListView.getWidth();
- }
-
- boolean result;
- switch (motionEvent.getActionMasked()) {
- case MotionEvent.ACTION_DOWN:
- result = handleDownEvent(view, motionEvent);
- break;
- case MotionEvent.ACTION_MOVE:
- result = handleMoveEvent(view, motionEvent);
- break;
- case MotionEvent.ACTION_UP:
- case MotionEvent.ACTION_CANCEL:
- result = handleUpCancelEvent(view, motionEvent);
- break;
- default:
- result = false;
- }
- return result;
- }
-
- private boolean handleDownEvent(final View view, final MotionEvent motionEvent) {
- mDisallowSwipe = false;
- if (mPaused) {
- return false;
- }
-
- // Find the child view that was touched (perform a hit test)
- Rect rect = new Rect();
- int childCount = mListView.getChildCount();
- int[] listViewCoords = new int[2];
- mListView.getLocationOnScreen(listViewCoords);
- int x = (int) motionEvent.getRawX() - listViewCoords[0];
- int y = (int) motionEvent.getRawY() - listViewCoords[1];
- View child;
- for (int i = 0; i < childCount; i++) {
- child = mListView.getChildAt(i);
- child.getHitRect(rect);
- if (rect.contains(x, y)) {
- mDownView = child;
- break;
- }
- }
-
- if (mDownView != null && mDownView instanceof ContextualUndoView) {
- mDownX = motionEvent.getRawX();
- mDownY = motionEvent.getRawY();
- int downPosition = AdapterViewUtil.getPositionForView(mListView, mDownView);
-
- if (mDismissableManager != null) {
- long downId = mListView.getAdapter().getItemId(downPosition);
- if (!mDismissableManager.isDismissable(downId, downPosition)) {
- /* Cancel, not dismissable */
- return false;
- }
- }
-
- mTouchChildTouched = !mIsParentHorizontalScrollContainer && mResIdOfTouchChild == 0;
-
- if (mResIdOfTouchChild != 0) {
- mIsParentHorizontalScrollContainer = false;
-
- final View childView = mDownView.findViewById(mResIdOfTouchChild);
- if (childView != null) {
- final Rect childRect = getChildViewRect(mListView, childView);
- if (childRect.contains((int) motionEvent.getX(), (int) motionEvent.getY())) {
- mTouchChildTouched = true;
- mListView.requestDisallowInterceptTouchEvent(true);
- }
- }
- }
-
- if (mIsParentHorizontalScrollContainer) {
- // Do it now and don't wait until the user moves more than
- // the slop factor.
- mTouchChildTouched = true;
- mListView.requestDisallowInterceptTouchEvent(true);
- }
-
- mDownY = motionEvent.getRawY();
- mDownPosition = AdapterViewUtil.getPositionForView(mListView, mDownView);
-
- if (mTouchChildTouched) {
- mVelocityTracker = VelocityTracker.obtain();
- mVelocityTracker.addMovement(motionEvent);
- } else {
- mVelocityTracker = null;
- }
- }
- view.onTouchEvent(motionEvent);
- return true;
- }
-
- @SuppressWarnings("UnusedParameters")
- private boolean handleMoveEvent(final View view, final MotionEvent motionEvent) {
- if (mVelocityTracker == null || mPaused) {
- return false;
- }
-
- mVelocityTracker.addMovement(motionEvent);
- float deltaX = motionEvent.getRawX() - mDownX;
- float deltaY = motionEvent.getRawY() - mDownY;
- if (mTouchChildTouched && !mDisallowSwipe && Math.abs(deltaX) > mSlop && Math.abs(deltaX) > Math.abs(deltaY)) {
- mSwiping = true;
- mListView.requestDisallowInterceptTouchEvent(true);
-
- // Cancel ListView's touch (un-highlighting the item)
- MotionEvent cancelEvent = MotionEvent.obtain(motionEvent);
- cancelEvent.setAction(MotionEvent.ACTION_CANCEL | motionEvent.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
- mListView.onTouchEvent(cancelEvent);
- cancelEvent.recycle();
- }
-
- if (mSwiping) {
- setTranslationX(mDownView, deltaX);
- //noinspection MagicNumber
- setAlpha(mDownView, Math.max(0f, Math.min(1f, 1f - 2f * Math.abs(deltaX) / mViewWidth)));
- return true;
- }
- return false;
- }
-
- @SuppressWarnings("UnusedParameters")
- private boolean handleUpCancelEvent(final View view, final MotionEvent motionEvent) {
- mDisallowSwipe = false;
- if (mVelocityTracker == null) {
- return false;
- }
-
- float deltaX = motionEvent.getRawX() - mDownX;
- mVelocityTracker.addMovement(motionEvent);
- mVelocityTracker.computeCurrentVelocity(1000);
- float velocityX = Math.abs(mVelocityTracker.getXVelocity());
- float velocityY = Math.abs(mVelocityTracker.getYVelocity());
- boolean dismiss = false;
- boolean dismissRight = false;
- final float absDeltaX = Math.abs(deltaX);
- if (absDeltaX > mViewWidth / 2) {
- dismiss = true;
- dismissRight = deltaX > 0;
- } else if (mMinFlingVelocity <= velocityX && velocityX <= mMaxFlingVelocity && velocityY < velocityX && absDeltaX > mSlop) {
- dismiss = true;
- dismissRight = mVelocityTracker.getXVelocity() > 0;
- }
- if (dismiss) {
- // dismiss
- final long itemId = ((ContextualUndoView) mDownView).getItemId();
- // before animation ends
- final int downPosition = mDownPosition;
- animate(mDownView).translationX(dismissRight ? mViewWidth : -mViewWidth).alpha(0).setDuration(mAnimationTime).setListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(final Animator animation) {
- mCallback.onViewSwiped(itemId, downPosition);
- }
- });
- } else {
- // cancel
- animate(mDownView).translationX(0).alpha(1).setDuration(mAnimationTime).setListener(null);
- }
-
- mVelocityTracker.recycle();
- mVelocityTracker = null;
- mDownX = 0;
- mDownView = null;
- mDownPosition = AdapterView.INVALID_POSITION;
- mSwiping = false;
- return false;
- }
-
- @Override
- public boolean isSwiping() {
- return mSwiping;
- }
-
- private Rect getChildViewRect(final View parentView, View childView) {
- final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
- if (parentView == childView) {
- return childRect;
-
- }
-
- ViewGroup parent;
- while ((parent = (ViewGroup) childView.getParent()) != parentView) {
- childRect.offset(parent.getLeft(), parent.getTop());
- childView = parent;
- }
-
- return childRect;
- }
-
- void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
- mIsParentHorizontalScrollContainer = mResIdOfTouchChild == 0 && isParentHorizontalScrollContainer;
- }
-
- void setTouchChild(final int childResId) {
- mResIdOfTouchChild = childResId;
- if (childResId != 0) {
- setIsParentHorizontalScrollContainer(false);
- }
- }
-}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoView.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoView.java
deleted file mode 100644
index 282a6137..00000000
--- a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoView.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2013 Frankie Sardo
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-@SuppressLint("ViewConstructor")
-public class ContextualUndoView extends FrameLayout {
-
- private View mUndoView;
- private View mContentView;
- private TextView mCountDownTV;
-
- private long mItemId;
-
- public ContextualUndoView(final Context context, final int undoLayoutResId, final int countDownTextViewResId) {
- super(context);
- initUndo(undoLayoutResId, countDownTextViewResId);
- }
-
- private void initUndo(final int undoLayoutResId, final int countDownTextViewResId) {
- mUndoView = View.inflate(getContext(), undoLayoutResId, null);
- addView(mUndoView);
-
- if (countDownTextViewResId != -1) {
- mCountDownTV = (TextView) mUndoView.findViewById(countDownTextViewResId);
- }
- }
-
- public void updateCountDownTimer(final String timerText) {
- if (mCountDownTV != null) {
- mCountDownTV.setText(timerText);
- }
- }
-
- public void updateContentView(final View contentView) {
- if (mContentView == null) {
- addView(contentView);
- }
- mContentView = contentView;
- }
-
- public View getContentView() {
- return mContentView;
- }
-
- public void setItemId(final long itemId) {
- this.mItemId = itemId;
- }
-
- public long getItemId() {
- return mItemId;
- }
-
- public boolean isContentDisplayed() {
- return mContentView.getVisibility() == View.VISIBLE;
- }
-
- public void displayUndo() {
- updateCountDownTimer("");
- mContentView.setVisibility(View.INVISIBLE);
- mUndoView.setVisibility(View.VISIBLE);
- }
-
- public void displayContentView() {
- mContentView.setVisibility(View.VISIBLE);
- mUndoView.setVisibility(View.INVISIBLE);
- }
-}
\ No newline at end of file
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/AnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/AnimationAdapter.java
deleted file mode 100644
index 50925f61..00000000
--- a/library/src/com/nhaarman/listviewanimations/swinginadapters/AnimationAdapter.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.nhaarman.listviewanimations.swinginadapters;
-
-import android.annotation.SuppressLint;
-import android.os.Build;
-import android.util.SparseArray;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-
-import com.nhaarman.listviewanimations.BaseAdapterDecorator;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorSet;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
-/**
- * A {@link BaseAdapterDecorator} class which applies multiple {@link Animator}s at once to
- * views when they are first shown. The Animators applied include the animations
- * specified in {@link #getAnimators(ViewGroup, View)}, plus an alpha transition.
- */
-public abstract class AnimationAdapter extends BaseAdapterDecorator {
-
- protected static final long DEFAULTANIMATIONDELAYMILLIS = 100;
- protected static final long DEFAULTANIMATIONDURATIONMILLIS = 300;
- private static final long INITIALDELAYMILLIS = 150;
- private static final String ALPHA = "alpha";
-
- private final SparseArray mAnimators;
- private long mAnimationStartMillis;
- private int mFirstAnimatedPosition;
- private int mLastAnimatedPosition;
- private boolean mHasParentAnimationAdapter;
- private boolean mShouldAnimate = true;
-
- private long mInitialDelayMillis = INITIALDELAYMILLIS;
- private long mAnimationDelayMillis = DEFAULTANIMATIONDELAYMILLIS;
- private long mAnimationDurationMillis = DEFAULTANIMATIONDURATIONMILLIS;
-
- public AnimationAdapter(final BaseAdapter baseAdapter) {
- super(baseAdapter);
- mAnimators = new SparseArray();
-
- mAnimationStartMillis = -1;
- mFirstAnimatedPosition = -1;
- mLastAnimatedPosition = -1;
-
- if (baseAdapter instanceof AnimationAdapter) {
- ((AnimationAdapter) baseAdapter).setHasParentAnimationAdapter(true);
- }
- }
-
- /**
- * Call this method to reset animation status on all views. The next time
- * {@link #notifyDataSetChanged()} is called on the base adapter, all views will
- * animate again. Will also call {@link #setShouldAnimate(boolean)} with a value of true.
- */
- public void reset() {
- mAnimators.clear();
- mFirstAnimatedPosition = -1;
- mLastAnimatedPosition = -1;
- mAnimationStartMillis = -1;
- mShouldAnimate = true;
-
- if (getDecoratedBaseAdapter() instanceof AnimationAdapter) {
- ((AnimationAdapter) getDecoratedBaseAdapter()).reset();
- }
- }
-
- /**
- * Set whether to animate the {@link View}s or not.
- * @param shouldAnimate true if the Views should be animated.
- */
- public void setShouldAnimate(final boolean shouldAnimate) {
- mShouldAnimate = shouldAnimate;
- }
-
- /**
- * Set the starting position for which items should animate. Given position will animate as well.
- * Will also call setShouldAnimate(true).
- * @param position the position.
- */
- @SuppressWarnings("UnusedDeclaration")
- public void setShouldAnimateFromPosition(final int position) {
- mShouldAnimate = true;
- mFirstAnimatedPosition = position - 1;
- mLastAnimatedPosition = position - 1;
- }
-
- /**
- * Set the starting position for which items should animate as the first position which isn't currently visible on screen.
- * This call is also valid when the {@link View}s haven't been drawn yet.
- * Will also call setShouldAnimate(true).
- */
- @SuppressWarnings("UnusedDeclaration")
- public void setShouldAnimateNotVisible() {
- if (getAbsListView() == null) {
- throw new IllegalStateException("Call setListView() on this AnimationAdapter before setShouldAnimateNotVisible()!");
- }
-
- mShouldAnimate = true;
- mFirstAnimatedPosition = getAbsListView().getLastVisiblePosition();
- mLastAnimatedPosition = getAbsListView().getLastVisiblePosition();
- }
-
- @Override
- public final View getView(final int position, final View convertView, final ViewGroup parent) {
- if (!mHasParentAnimationAdapter) {
- if (getAbsListView() == null) {
- throw new IllegalStateException("Call setListView() on this AnimationAdapter before setAdapter()!");
- }
-
- if (convertView != null) {
- cancelExistingAnimation(convertView);
- }
- }
-
- View itemView = super.getView(position, convertView, parent);
-
- if (!mHasParentAnimationAdapter) {
- animateViewIfNecessary(position, itemView, parent);
- }
- return itemView;
- }
-
- private void cancelExistingAnimation(final View convertView) {
- int hashCode = convertView.hashCode();
- Animator animator = mAnimators.get(hashCode);
- if (animator != null) {
- animator.end();
- mAnimators.remove(hashCode);
- }
- }
-
- private void animateViewIfNecessary(final int position, final View view, final ViewGroup parent) {
- boolean isMeasuringGridViewItem = getAbsListView() instanceof GridView && parent.getHeight() == 0;
-
- if (position > mLastAnimatedPosition && mShouldAnimate && !isMeasuringGridViewItem) {
- if (mFirstAnimatedPosition == -1) {
- mFirstAnimatedPosition = position;
- }
-
- animateView(parent, view);
- mLastAnimatedPosition = position;
- }
- }
-
- private void animateView(final ViewGroup parent, final View view) {
- if (mAnimationStartMillis == -1) {
- mAnimationStartMillis = System.currentTimeMillis();
- }
-
- ViewHelper.setAlpha(view, 0);
-
- Animator[] childAnimators;
- if (mDecoratedBaseAdapter instanceof AnimationAdapter) {
- childAnimators = ((AnimationAdapter) mDecoratedBaseAdapter).getAnimators(parent, view);
- } else {
- childAnimators = new Animator[0];
- }
- Animator[] animators = getAnimators(parent, view);
- Animator alphaAnimator = ObjectAnimator.ofFloat(view, ALPHA, 0, 1);
-
- AnimatorSet set = new AnimatorSet();
- set.playTogether(concatAnimators(childAnimators, animators, alphaAnimator));
- set.setStartDelay(calculateAnimationDelay());
- set.setDuration(getAnimationDurationMillis());
- set.start();
-
- mAnimators.put(view.hashCode(), set);
- }
-
- private Animator[] concatAnimators(final Animator[] childAnimators, final Animator[] animators, final Animator alphaAnimator) {
- Animator[] allAnimators = new Animator[childAnimators.length + animators.length + 1];
- int i;
-
- for (i = 0; i < animators.length; ++i) {
- allAnimators[i] = animators[i];
- }
-
- for (Animator childAnimator : childAnimators) {
- allAnimators[i] = childAnimator;
- ++i;
- }
-
- allAnimators[allAnimators.length - 1] = alphaAnimator;
- return allAnimators;
- }
-
- @SuppressLint("NewApi")
- private long calculateAnimationDelay() {
- long delay;
-
- int lastVisiblePosition = getAbsListView().getLastVisiblePosition();
- int firstVisiblePosition = getAbsListView().getFirstVisiblePosition();
-
- int numberOfItemsOnScreen = lastVisiblePosition - firstVisiblePosition;
- int numberOfAnimatedItems = mLastAnimatedPosition - mFirstAnimatedPosition;
-
- if (numberOfItemsOnScreen + 1 < numberOfAnimatedItems) {
- delay = getAnimationDelayMillis();
-
- if (getAbsListView() instanceof GridView && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- delay += getAnimationDelayMillis() * ((mLastAnimatedPosition + 1) % ((GridView) getAbsListView()).getNumColumns());
- }
- } else {
- long delaySinceStart = (mLastAnimatedPosition - mFirstAnimatedPosition + 1) * getAnimationDelayMillis();
- delay = mAnimationStartMillis + getInitialDelayMillis() + delaySinceStart - System.currentTimeMillis();
- }
- return Math.max(0, delay);
- }
-
- /**
- * Set whether this AnimationAdapter is encapsulated by another
- * AnimationAdapter. When this is set to true, this AnimationAdapter does
- * not apply any animations to the views. Should not be set explicitly, the
- * AnimationAdapter class manages this by itself.
- */
- public void setHasParentAnimationAdapter(final boolean hasParentAnimationAdapter) {
- mHasParentAnimationAdapter = hasParentAnimationAdapter;
- }
-
- /**
- * Get the delay in milliseconds before the first animation should start. Defaults to {@value #INITIALDELAYMILLIS}.
- */
- protected long getInitialDelayMillis() {
- return mInitialDelayMillis;
- }
-
- /**
- * Set the delay in milliseconds before the first animation should start. Defaults to {@value #INITIALDELAYMILLIS}.
- * @param delayMillis the time in milliseconds.
- */
- public void setInitialDelayMillis(final long delayMillis) {
- mInitialDelayMillis = delayMillis;
- }
-
- /**
- * Get the delay in milliseconds before an animation of a view should start. Defaults to {@value #DEFAULTANIMATIONDELAYMILLIS}.
- */
- protected long getAnimationDelayMillis() {
- return mAnimationDelayMillis;
- }
-
- /**
- * Set the delay in milliseconds before an animation of a view should start. Defaults to {@value #DEFAULTANIMATIONDELAYMILLIS}.
- * @param delayMillis the time in milliseconds.
- */
- @SuppressWarnings("UnusedDeclaration")
- public void setAnimationDelayMillis(final long delayMillis) {
- mAnimationDelayMillis = delayMillis;
- }
-
- /**
- * Get the duration of the animation in milliseconds. Defaults to {@value #DEFAULTANIMATIONDURATIONMILLIS}.
- */
- protected long getAnimationDurationMillis() {
- return mAnimationDurationMillis;
- }
-
- /**
- * Set the duration of the animation in milliseconds. Defaults to {@value #DEFAULTANIMATIONDURATIONMILLIS}.
- * @param durationMillis the time in milliseconds.
- */
- @SuppressWarnings("UnusedDeclaration")
- public void setAnimationDurationMillis(final long durationMillis) {
- mAnimationDurationMillis = durationMillis;
- }
-
- /**
- * Get the Animators to apply to the views. In addition to the returned
- * Animators, an alpha transition will be applied to the view.
- *
- * @param parent
- * The parent of the view
- * @param view
- * The view that will be animated, as retrieved by getView()
- */
- public abstract Animator[] getAnimators(ViewGroup parent, View view);
-}
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java
deleted file mode 100644
index dac9feb4..00000000
--- a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.nhaarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.nhaarman.listviewanimations.swinginadapters.AnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-
-public class AlphaInAnimationAdapter extends AnimationAdapter {
-
- public AlphaInAnimationAdapter(final BaseAdapter baseAdapter) {
- super(baseAdapter);
- }
-
- @Override
- protected long getAnimationDelayMillis() {
- return DEFAULTANIMATIONDELAYMILLIS;
- }
-
- @Override
- protected long getAnimationDurationMillis() {
- return DEFAULTANIMATIONDURATIONMILLIS;
- }
-
- @Override
- public Animator[] getAnimators(final ViewGroup parent, final View view) {
- return new Animator[0];
- }
-}
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java
deleted file mode 100644
index 8aeecc2d..00000000
--- a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.nhaarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.nhaarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ObjectAnimator;
-
-/**
- * An implementation of the AnimationAdapter class which applies a
- * swing-in-from-bottom-animation to views.
- */
-public class SwingBottomInAnimationAdapter extends SingleAnimationAdapter {
-
- private static final String TRANSLATION_Y = "translationY";
- private final long mAnimationDelayMillis;
- private final long mAnimationDurationMillis;
-
- public SwingBottomInAnimationAdapter(final BaseAdapter baseAdapter) {
- this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
- }
-
- public SwingBottomInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis) {
- this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
- }
-
- public SwingBottomInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis, final long animationDurationMillis) {
- super(baseAdapter);
- mAnimationDelayMillis = animationDelayMillis;
- mAnimationDurationMillis = animationDurationMillis;
- }
-
- @Override
- protected long getAnimationDelayMillis() {
- return mAnimationDelayMillis;
- }
-
- @Override
- protected long getAnimationDurationMillis() {
- return mAnimationDurationMillis;
- }
-
- @Override
- protected Animator getAnimator(final ViewGroup parent, final View view) {
- // TODO magic number
- return ObjectAnimator.ofFloat(view, TRANSLATION_Y, 500, 0);
- }
-
-}
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java
deleted file mode 100644
index 1e3d00e1..00000000
--- a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.nhaarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.nhaarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ObjectAnimator;
-
-/**
- * An implementation of the AnimationAdapter class which applies a
- * swing-in-from-the-right-animation to views.
- */
-public class SwingRightInAnimationAdapter extends SingleAnimationAdapter {
-
- private static final String TRANSLATION_X = "translationX";
- private final long mAnimationDelayMillis;
- private final long mAnimationDurationMillis;
-
- public SwingRightInAnimationAdapter(final BaseAdapter baseAdapter) {
- this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
- }
-
- public SwingRightInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis) {
- this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
- }
-
- public SwingRightInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis, final long animationDurationMillis) {
- super(baseAdapter);
- mAnimationDelayMillis = animationDelayMillis;
- mAnimationDurationMillis = animationDurationMillis;
- }
-
- @Override
- protected long getAnimationDelayMillis() {
- return mAnimationDelayMillis;
- }
-
- @Override
- protected long getAnimationDurationMillis() {
- return mAnimationDurationMillis;
- }
-
- @Override
- protected Animator getAnimator(final ViewGroup parent, final View view) {
- return ObjectAnimator.ofFloat(view, TRANSLATION_X, parent.getWidth(), 0);
- }
-}
diff --git a/library/src/com/nhaarman/listviewanimations/util/AdapterViewUtil.java b/library/src/com/nhaarman/listviewanimations/util/AdapterViewUtil.java
deleted file mode 100644
index 5b373e68..00000000
--- a/library/src/com/nhaarman/listviewanimations/util/AdapterViewUtil.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.nhaarman.listviewanimations.util;
-
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-public class AdapterViewUtil {
-
- /**
- * Get the position within the adapter's dataset for the view, where view is an adapter item or a descendant of an adapter item.
- * Unlike {@link AdapterView#getPositionForView(android.view.View)}, returned position will reflect the position of the item given view is representing,
- * by subtracting the header views count.
- * @param adapterView the AdapterView containing the view.
- * @param view an adapter item or a descendant of an adapter item. This must be visible in given AdapterView at the time of the call.
- * @return the position of the item in the AdapterView represented by given view, or {@link AdapterView#INVALID_POSITION} if the view does not
- * correspond to a list item (or it is not visible).
- */
- public static int getPositionForView(final AdapterView adapterView, final View view) {
- int position = adapterView.getPositionForView(view);
-
- if (adapterView instanceof ListView) {
- position -= ((ListView) adapterView).getHeaderViewsCount();
- }
-
- return position;
- }
-}
diff --git a/library/src/com/nhaarman/listviewanimations/widget/DynamicListView.java b/library/src/com/nhaarman/listviewanimations/widget/DynamicListView.java
deleted file mode 100644
index b45c8f79..00000000
--- a/library/src/com/nhaarman/listviewanimations/widget/DynamicListView.java
+++ /dev/null
@@ -1,796 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.nhaarman.listviewanimations.widget;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.HeaderViewListAdapter;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeOnTouchListener;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.animation.TypeEvaluator;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
-/**
- * The DynamicListView is an extension of {@link ListView} that supports cell dragging
- * and swapping.
- *
- * Make sure your adapter has stable ids, and override {@link ListAdapter#hasStableIds()} to return true.
- *
- * This layout is in charge of positioning the hover cell in the correct location
- * on the screen in response to user touch events. It uses the position of the
- * hover cell to determine when two cells should be swapped. If two cells should
- * be swapped, all the corresponding data set and layout changes are handled here.
- *
- * If no cell is selected, all the touch events are passed down to the ListView
- * and behave normally. If one of the items in the ListView experiences a
- * long press event, the contents of its current visible state are captured as
- * a bitmap and its visibility is set to INVISIBLE. A hover cell is then created and
- * added to this layout as an overlaying BitmapDrawable above the ListView. Once the
- * hover cell is translated some distance to signify an item swap, a data set change
- * accompanied by animation takes place. When the user releases the hover cell,
- * it animates into its corresponding position in the ListView.
- *
- * When the hover cell is either above or below the bounds of the ListView, this
- * ListView also scrolls on its own so as to reveal additional content.
- *
- * See http://youtu.be/_BZIvjMgH-Q
- */
-public class DynamicListView extends ListView {
-
- private int mOriginalTranscriptMode;
-
- public interface OnHoverCellListener {
- public Drawable onHoverCellCreated(Drawable hoverCellDrawable);
- }
-
- /**
- * Implement this interface to be notified of ordering changes. Call {@link #setOnItemMovedListener(com.nhaarman.listviewanimations.widget.DynamicListView.OnItemMovedListener)}.
- */
- public interface OnItemMovedListener {
- /**
- * Called after an item is dropped and moved.
- *
- * @param newPosition the new position of the item.
- */
- public void onItemMoved(int newPosition);
- }
-
- private final int SMOOTH_SCROLL_AMOUNT_AT_EDGE = 15;
- private final int MOVE_DURATION = 150;
-
- private int mLastEventY = -1, mLastEventX = -1;
-
- private int mDownY = -1;
- private int mDownX = -1;
-
- private int mTotalOffset = 0;
-
- private boolean mCellIsMobile = false;
- private boolean mIsMobileScrolling = false;
- private int mSmoothScrollAmountAtEdge = 0;
-
- private final int INVALID_ID = -1;
- private long mAboveItemId = INVALID_ID;
- private long mMobileItemId = INVALID_ID;
- private long mBelowItemId = INVALID_ID;
-
- private Drawable mHoverCell;
- private Rect mHoverCellCurrentBounds;
- private Rect mHoverCellOriginalBounds;
-
- private final int INVALID_POINTER_ID = -1;
- private int mActivePointerId = INVALID_POINTER_ID;
-
- private boolean mIsWaitingForScrollFinish = false;
- private int mScrollState = OnScrollListener.SCROLL_STATE_IDLE;
-
- private OnTouchListener mOnTouchListener;
- private boolean mIsParentHorizontalScrollContainer;
- private int mResIdOfDynamicTouchChild;
- private boolean mDynamicTouchChildTouched;
- private int mSlop;
-
- private boolean mSkipCallingOnTouchListener;
-
- private OnHoverCellListener mOnHoverCellListener;
-
- private OnItemMovedListener mOnItemMovedListener;
- private int mLastMovedToIndex;
-
- public DynamicListView(Context context) {
- super(context);
- init(context);
- }
-
- public DynamicListView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- init(context);
- }
-
- public DynamicListView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init(context);
- }
-
- public void init(Context context) {
- setOnItemLongClickListener(mOnItemLongClickListener);
- setOnScrollListener(mScrollListener);
- DisplayMetrics metrics = context.getResources().getDisplayMetrics();
- mSmoothScrollAmountAtEdge = (int) (SMOOTH_SCROLL_AMOUNT_AT_EDGE / metrics.density);
- ViewConfiguration vc = ViewConfiguration.get(getContext());
- mSlop = vc.getScaledTouchSlop();
- }
-
- public void setAdapter(BaseAdapter adapter) {
- super.setAdapter(adapter);
- }
-
- @Override
- @Deprecated
- /**
- * @deprecated use #setAdapter(BaseAdapter) instead.
- */
- public void setAdapter(ListAdapter adapter) {
- if (!(adapter instanceof BaseAdapter)) {
- throw new IllegalArgumentException("DynamicListView needs a BaseAdapter!");
- }
- super.setAdapter(adapter);
- }
-
- /**
- * Listens for long clicks on any items in the listview. When a cell has
- * been selected, the hover cell is created and set up.
- */
- private OnItemLongClickListener mOnItemLongClickListener = new OnItemLongClickListener() {
- public boolean onItemLongClick(AdapterView arg0, View arg1, int pos, long id) {
- if (mResIdOfDynamicTouchChild == 0) {
- mDynamicTouchChildTouched = true;
- makeCellMobile();
- return true;
- }
- return false;
- }
- };
-
- private void makeCellMobile() {
- int position = pointToPosition(mDownX, mDownY);
- int itemNum = position - getFirstVisiblePosition();
- View selectedView = getChildAt(itemNum);
- if (selectedView == null || position < getHeaderViewsCount() || position >= getAdapter().getCount() - getHeaderViewsCount()) {
- return;
- }
-
- mOriginalTranscriptMode = getTranscriptMode();
- setTranscriptMode(TRANSCRIPT_MODE_NORMAL);
-
-
- mTotalOffset = 0;
-
- mMobileItemId = getAdapter().getItemId(position);
- mHoverCell = getAndAddHoverView(selectedView);
- if (mOnHoverCellListener != null) {
- mHoverCell = mOnHoverCellListener.onHoverCellCreated(mHoverCell);
- }
- selectedView.setVisibility(INVISIBLE);
-
- mCellIsMobile = true;
- getParent().requestDisallowInterceptTouchEvent(true);
-
- updateNeighborViewsForId(mMobileItemId);
- }
-
- /**
- * Creates the hover cell with the appropriate bitmap and of appropriate
- * size. The hover cell's BitmapDrawable is drawn on top of the bitmap every
- * single time an invalidate call is made.
- */
- private BitmapDrawable getAndAddHoverView(View v) {
- int w = v.getWidth();
- int h = v.getHeight();
- int top = v.getTop();
- int left = v.getLeft();
-
- Bitmap b = getBitmapFromView(v);
-
- BitmapDrawable drawable = new BitmapDrawable(getResources(), b);
-
- mHoverCellOriginalBounds = new Rect(left, top, left + w, top + h);
- mHoverCellCurrentBounds = new Rect(mHoverCellOriginalBounds);
-
- drawable.setBounds(mHoverCellCurrentBounds);
-
- return drawable;
- }
-
- /**
- * Returns a bitmap showing a screenshot of the view passed in.
- */
- private Bitmap getBitmapFromView(View v) {
- Bitmap bitmap = Bitmap.createBitmap(v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
- Canvas canvas = new Canvas(bitmap);
- v.draw(canvas);
- return bitmap;
- }
-
- /**
- * Stores a reference to the views above and below the item currently
- * corresponding to the hover cell. It is important to note that if this
- * item is either at the top or bottom of the list, mAboveItemId or mBelowItemId
- * may be invalid.
- */
- private void updateNeighborViewsForId(long itemId) {
- int position = getPositionForId(itemId);
- ListAdapter adapter = getAdapter();
- if (!adapter.hasStableIds()) {
- throw new IllegalStateException("Adapter doesn't have stable ids! Make sure your adapter has stable ids, and override hasStableIds() to return true.");
- }
-
- mAboveItemId = position - 1 >= 0 ? adapter.getItemId(position - 1) : INVALID_ROW_ID;
- mBelowItemId = position + 1 < adapter.getCount() ? adapter.getItemId(position + 1) : INVALID_ROW_ID;
- }
-
- /**
- * Retrieves the view in the list corresponding to itemId
- */
- private View getViewForId(long itemId) {
- int firstVisiblePosition = getFirstVisiblePosition();
- ListAdapter adapter = getAdapter();
- if (!adapter.hasStableIds()) {
- throw new IllegalStateException("Adapter doesn't have stable ids! Make sure your adapter has stable ids, and override hasStableIds() to return true.");
- }
-
- for (int i = 0; i < getChildCount(); i++) {
- View v = getChildAt(i);
- int position = firstVisiblePosition + i;
- long id = adapter.getItemId(position);
- if (id == itemId) {
- return v;
- }
- }
- return null;
- }
-
- /**
- * Retrieves the position in the list corresponding to itemId
- */
- private int getPositionForId(long itemId) {
- View v = getViewForId(itemId);
- if (v == null) {
- return -1;
- } else {
- return getPositionForView(v);
- }
- }
-
- /**
- * dispatchDraw gets invoked when all the child views are about to be drawn.
- * By overriding this method, the hover cell (BitmapDrawable) can be drawn
- * over the listview's items whenever the listview is redrawn.
- */
- @Override
- protected void dispatchDraw(Canvas canvas) {
- super.dispatchDraw(canvas);
- if (mHoverCell != null) {
- mHoverCell.draw(canvas);
- }
- }
-
- @Override
- public void setOnTouchListener(OnTouchListener l) {
- mOnTouchListener = l;
- }
-
- public void setOnHoverCellListener(OnHoverCellListener onHoverCellListener) {
- mOnHoverCellListener = onHoverCellListener;
- }
-
- private Rect getChildViewRect(View parentView, View childView) {
- final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
- if (parentView == childView) {
- return childRect;
- }
-
- ViewGroup parent;
- while ((parent = (ViewGroup) childView.getParent()) != parentView) {
- childRect.offset(parent.getLeft(), parent.getTop());
- childView = parent;
- }
-
- return childRect;
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- if (mSkipCallingOnTouchListener) {
- return super.onTouchEvent(event);
- }
-
- if (mOnTouchListener instanceof SwipeOnTouchListener) {
- if (((SwipeOnTouchListener) mOnTouchListener).isSwiping()) {
- mSkipCallingOnTouchListener = true;
- boolean retVal = mOnTouchListener.onTouch(this, event);
- mSkipCallingOnTouchListener = false;
- return retVal || super.onTouchEvent(event);
- }
- }
-
- switch (event.getAction() & MotionEvent.ACTION_MASK) {
- case MotionEvent.ACTION_DOWN:
- mDownX = (int) event.getX();
- mDownY = (int) event.getY();
- mActivePointerId = event.getPointerId(0);
-
- mDynamicTouchChildTouched = false;
- if (mResIdOfDynamicTouchChild != 0) {
- mIsParentHorizontalScrollContainer = false;
-
- int position = pointToPosition(mDownX, mDownY);
- int childNum = (position != INVALID_POSITION) ? position - getFirstVisiblePosition() : -1;
- View itemView = (childNum >= 0) ? getChildAt(childNum) : null;
- View childView = (itemView != null) ? itemView.findViewById(mResIdOfDynamicTouchChild) : null;
- if (childView != null) {
- final Rect childRect = getChildViewRect(this, childView);
- if (childRect.contains(mDownX, mDownY)) {
- mDynamicTouchChildTouched = true;
- getParent().requestDisallowInterceptTouchEvent(true);
- }
- }
- }
-
- if (mIsParentHorizontalScrollContainer) {
- // Do it now and don't wait until the user moves more than the
- // slop factor.
- getParent().requestDisallowInterceptTouchEvent(true);
- }
- break;
- case MotionEvent.ACTION_MOVE:
- if (mActivePointerId == INVALID_POINTER_ID) {
- break;
- }
-
- int pointerIndex = event.findPointerIndex(mActivePointerId);
-
- mLastEventY = (int) event.getY(pointerIndex);
- mLastEventX = (int) event.getX(pointerIndex);
- int deltaY = mLastEventY - mDownY;
- int deltaX = mLastEventX - mDownX;
-
- if (!mCellIsMobile && mDynamicTouchChildTouched) {
- if (Math.abs(deltaY) > mSlop && Math.abs(deltaY) > Math.abs(deltaX)) {
- makeCellMobile();
-
- // Cancel ListView's touch (un-highlighting the item)
- MotionEvent cancelEvent = MotionEvent.obtain(event);
- cancelEvent.setAction(MotionEvent.ACTION_CANCEL | (event.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
- super.onTouchEvent(cancelEvent);
- cancelEvent.recycle();
- }
- }
-
- if (mCellIsMobile) {
- mHoverCellCurrentBounds.offsetTo(mHoverCellOriginalBounds.left, mHoverCellOriginalBounds.top + deltaY + mTotalOffset);
- mHoverCell.setBounds(mHoverCellCurrentBounds);
- invalidate();
-
- handleCellSwitch();
-
- mIsMobileScrolling = false;
- handleMobileCellScroll();
- }
- break;
- case MotionEvent.ACTION_UP:
- mDynamicTouchChildTouched = false;
- touchEventsEnded();
- break;
- case MotionEvent.ACTION_CANCEL:
- mDynamicTouchChildTouched = false;
- touchEventsCancelled();
- break;
- case MotionEvent.ACTION_POINTER_UP:
- /*
- * If a multitouch event took place and the original touch dictating
- * the movement of the hover cell has ended, then the dragging event
- * ends and the hover cell is animated to its corresponding position
- * in the listview.
- */
- pointerIndex = (event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
- final int pointerId = event.getPointerId(pointerIndex);
- if (pointerId == mActivePointerId) {
- mDynamicTouchChildTouched = false;
- touchEventsEnded();
- }
- break;
- default:
- break;
- }
-
- if (mCellIsMobile) {
- return false;
- } else if (mOnTouchListener != null) {
- mSkipCallingOnTouchListener = true;
- boolean retVal = mOnTouchListener.onTouch(this, event);
- mSkipCallingOnTouchListener = false;
- if (retVal) {
- return true;
- }
- }
- return super.onTouchEvent(event);
- }
-
- /**
- * This method determines whether the hover cell has been shifted far enough
- * to invoke a cell swap. If so, then the respective cell swap candidate is
- * determined and the data set is changed. Upon posting a notification of the
- * data set change, a layout is invoked to place the cells in the right place.
- * Using a ViewTreeObserver and a corresponding OnPreDrawListener, we can
- * offset the cell being swapped to where it previously was and then animate it to
- * its new position.
- */
- private void handleCellSwitch() {
- final int deltaY = mLastEventY - mDownY;
- int deltaYTotal = mHoverCellOriginalBounds.top + mTotalOffset + deltaY;
-
- View belowView = getViewForId(mBelowItemId);
- View mobileView = getViewForId(mMobileItemId);
- View aboveView = getViewForId(mAboveItemId);
-
- boolean isBelow = (belowView != null) && (deltaYTotal > belowView.getTop());
- boolean isAbove = (aboveView != null) && (deltaYTotal < aboveView.getTop());
-
- if (isBelow || isAbove) {
-
- final long switchItemId = isBelow ? mBelowItemId : mAboveItemId;
- View switchView = isBelow ? belowView : aboveView;
- final int originalItem = getPositionForView(mobileView);
-
- if (switchView == null) {
- updateNeighborViewsForId(mMobileItemId);
- return;
- }
-
- if (getPositionForView(switchView) < getHeaderViewsCount()) {
- return;
- }
- swapElements(originalItem, getPositionForView(switchView));
-
- BaseAdapter adapter;
- if (getAdapter() instanceof HeaderViewListAdapter) {
- adapter = (BaseAdapter) ((HeaderViewListAdapter) getAdapter()).getWrappedAdapter();
- } else {
- adapter = (BaseAdapter) getAdapter();
- }
- adapter.notifyDataSetChanged();
-
- mDownY = mLastEventY;
- mDownX = mLastEventX;
-
- final int switchViewStartTop = switchView.getTop();
-
- mobileView.setVisibility(View.VISIBLE);
- switchView.setVisibility(View.INVISIBLE);
-
- updateNeighborViewsForId(mMobileItemId);
-
- final ViewTreeObserver observer = getViewTreeObserver();
- observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
- public boolean onPreDraw() {
- observer.removeOnPreDrawListener(this);
-
- View switchView = getViewForId(switchItemId);
-
- mTotalOffset += deltaY;
-
- int switchViewNewTop = switchView.getTop();
- int delta = switchViewStartTop - switchViewNewTop;
-
- ViewHelper.setTranslationY(switchView, delta);
-
- ObjectAnimator animator = ObjectAnimator.ofFloat(switchView, "translationY", 0);
- animator.setDuration(MOVE_DURATION);
- animator.start();
-
- return true;
- }
- });
- }
- }
-
- private void swapElements(int indexOne, int indexTwo) {
- mLastMovedToIndex = indexTwo;
- ListAdapter adapter = getAdapter();
-
- if (adapter instanceof HeaderViewListAdapter) {
- adapter = ((HeaderViewListAdapter) adapter).getWrappedAdapter();
- }
-
- if (adapter instanceof Swappable) {
- ((Swappable) adapter).swapItems(indexOne - getHeaderViewsCount(), indexTwo - getHeaderViewsCount());
- }
- }
-
- /**
- * Resets all the appropriate fields to a default state while also animating
- * the hover cell back to its correct location.
- */
- private void touchEventsEnded() {
- final View mobileView = getViewForId(mMobileItemId);
- if (mCellIsMobile || mIsWaitingForScrollFinish) {
- mCellIsMobile = false;
- mIsWaitingForScrollFinish = false;
- mIsMobileScrolling = false;
- mActivePointerId = INVALID_POINTER_ID;
-
- /* Restore the transcript mode */
- setTranscriptMode(mOriginalTranscriptMode);
-
- // If the autoscroller has not completed scrolling, we need to wait
- // for it to
- // finish in order to determine the final location of where the
- // hover cell
- // should be animated to.
- if (mScrollState != OnScrollListener.SCROLL_STATE_IDLE) {
- mIsWaitingForScrollFinish = true;
- return;
- }
-
- mHoverCellCurrentBounds.offsetTo(mHoverCellOriginalBounds.left, mobileView.getTop());
-
- ObjectAnimator hoverViewAnimator = ObjectAnimator.ofObject(mHoverCell, "bounds", sBoundEvaluator, mHoverCellCurrentBounds);
- hoverViewAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator valueAnimator) {
- invalidate();
- }
- });
- hoverViewAnimator.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationStart(Animator animation) {
- setEnabled(false);
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- mAboveItemId = INVALID_ID;
- mMobileItemId = INVALID_ID;
- mBelowItemId = INVALID_ID;
- mobileView.setVisibility(VISIBLE);
- mHoverCell = null;
- setEnabled(true);
- invalidate();
- if (mOnItemMovedListener != null) {
- mOnItemMovedListener.onItemMoved(mLastMovedToIndex - getHeaderViewsCount());
- }
- }
- });
- hoverViewAnimator.start();
- } else {
- touchEventsCancelled();
- }
- }
-
- /**
- * Resets all the appropriate fields to a default state.
- */
- private void touchEventsCancelled() {
- View mobileView = getViewForId(mMobileItemId);
- if (mCellIsMobile) {
- mAboveItemId = INVALID_ID;
- mMobileItemId = INVALID_ID;
- mBelowItemId = INVALID_ID;
- mobileView.setVisibility(VISIBLE);
- mHoverCell = null;
- invalidate();
- }
- mCellIsMobile = false;
- mIsMobileScrolling = false;
- mActivePointerId = INVALID_POINTER_ID;
- }
-
- /**
- * This TypeEvaluator is used to animate the BitmapDrawable back to its
- * final location when the user lifts his finger by modifying the
- * BitmapDrawable's bounds.
- */
- private final static TypeEvaluator sBoundEvaluator = new TypeEvaluator() {
- public Rect evaluate(float fraction, Rect startValue, Rect endValue) {
- return new Rect(interpolate(startValue.left, endValue.left, fraction), interpolate(startValue.top, endValue.top, fraction), interpolate(startValue.right, endValue.right, fraction),
- interpolate(startValue.bottom, endValue.bottom, fraction));
- }
-
- public int interpolate(int start, int end, float fraction) {
- return (int) (start + fraction * (end - start));
- }
- };
-
- /**
- * Determines whether this listview is in a scrolling state invoked
- * by the fact that the hover cell is out of the bounds of the listview;
- */
- private void handleMobileCellScroll() {
- mIsMobileScrolling = handleMobileCellScroll(mHoverCellCurrentBounds);
- }
-
- /**
- * This method is in charge of determining if the hover cell is above
- * or below the bounds of the listview. If so, the listview does an appropriate
- * upward or downward smooth scroll so as to reveal new items.
- */
- private boolean handleMobileCellScroll(Rect r) {
- int offset = computeVerticalScrollOffset();
- int height = getHeight();
- int extent = computeVerticalScrollExtent();
- int range = computeVerticalScrollRange();
- int hoverViewTop = r.top;
- int hoverHeight = r.height();
-
- if (hoverViewTop <= 0 && offset > 0) {
- smoothScrollBy(-mSmoothScrollAmountAtEdge, 0);
- return true;
- }
-
- if (hoverViewTop + hoverHeight >= height && (offset + extent) < range) {
- smoothScrollBy(mSmoothScrollAmountAtEdge, 0);
- return true;
- }
-
- return false;
- }
-
- public void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
- mIsParentHorizontalScrollContainer = (mResIdOfDynamicTouchChild == 0) && isParentHorizontalScrollContainer;
- }
-
- public boolean isParentHorizontalScrollContainer() {
- return mIsParentHorizontalScrollContainer;
- }
-
- public void setDynamicTouchChild(int childResId) {
- mResIdOfDynamicTouchChild = childResId;
- if (childResId != 0) {
- setIsParentHorizontalScrollContainer(false);
- }
- }
-
- /**
- * This scroll listener is added to the listview in order to handle cell swapping
- * when the cell is either at the top or bottom edge of the listview. If the hover
- * cell is at either edge of the listview, the listview will begin scrolling. As
- * scrolling takes place, the listview continuously checks if new cells became visible
- * and determines whether they are potential candidates for a cell swap.
- */
- private OnScrollListener mScrollListener = new OnScrollListener() {
-
- private int mPreviousFirstVisibleItem = -1;
- private int mPreviousVisibleItemCount = -1;
- private int mCurrentFirstVisibleItem;
- private int mCurrentVisibleItemCount;
- private int mCurrentScrollState;
-
- public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
- mCurrentFirstVisibleItem = firstVisibleItem;
- mCurrentVisibleItemCount = visibleItemCount;
-
- mPreviousFirstVisibleItem = (mPreviousFirstVisibleItem == -1) ? mCurrentFirstVisibleItem : mPreviousFirstVisibleItem;
- mPreviousVisibleItemCount = (mPreviousVisibleItemCount == -1) ? mCurrentVisibleItemCount : mPreviousVisibleItemCount;
-
- checkAndHandleFirstVisibleCellChange();
- checkAndHandleLastVisibleCellChange();
-
- mPreviousFirstVisibleItem = mCurrentFirstVisibleItem;
- mPreviousVisibleItemCount = mCurrentVisibleItemCount;
- }
-
- @Override
- public void onScrollStateChanged(AbsListView view, int scrollState) {
- mCurrentScrollState = scrollState;
- mScrollState = scrollState;
- isScrollCompleted();
- }
-
- /**
- * This method is in charge of invoking 1 of 2 actions. Firstly, if the listview
- * is in a state of scrolling invoked by the hover cell being outside the bounds
- * of the listview, then this scrolling event is continued. Secondly, if the hover
- * cell has already been released, this invokes the animation for the hover cell
- * to return to its correct position after the listview has entered an idle scroll
- * state.
- */
- private void isScrollCompleted() {
- if (mCurrentVisibleItemCount > 0 && mCurrentScrollState == SCROLL_STATE_IDLE) {
- if (mCellIsMobile && mIsMobileScrolling) {
- handleMobileCellScroll();
- } else if (mIsWaitingForScrollFinish) {
- touchEventsEnded();
- }
- }
- }
-
- /**
- * Determines if the listview scrolled up enough to reveal a new cell at the
- * top of the list. If so, then the appropriate parameters are updated.
- */
- public void checkAndHandleFirstVisibleCellChange() {
- if (mCurrentFirstVisibleItem != mPreviousFirstVisibleItem) {
- if (mCellIsMobile && mMobileItemId != INVALID_ID) {
- updateNeighborViewsForId(mMobileItemId);
- handleCellSwitch();
- }
- }
- }
-
- /**
- * Determines if the listview scrolled down enough to reveal a new cell at the
- * bottom of the list. If so, then the appropriate parameters are updated.
- */
- public void checkAndHandleLastVisibleCellChange() {
- int currentLastVisibleItem = mCurrentFirstVisibleItem + mCurrentVisibleItemCount;
- int previousLastVisibleItem = mPreviousFirstVisibleItem + mPreviousVisibleItemCount;
- if (currentLastVisibleItem != previousLastVisibleItem) {
- if (mCellIsMobile && mMobileItemId != INVALID_ID) {
- updateNeighborViewsForId(mMobileItemId);
- handleCellSwitch();
- }
- }
- }
- };
-
- /**
- * Set the {@link com.nhaarman.listviewanimations.widget.DynamicListView.OnItemMovedListener} to be notified when an item is dropped.
- */
- public void setOnItemMovedListener(OnItemMovedListener onItemMovedListener) {
- this.mOnItemMovedListener = onItemMovedListener;
- }
-
- /**
- * Interface, usually implemented by a {@link com.nhaarman.listviewanimations.BaseAdapterDecorator},
- * that indicates that it can swap the visual position of two list items.
- *
- * @author Anton Spaans on 9/11/13.
- */
- public interface Swappable {
-
- /**
- * Swaps the item on the first adapter position with the item on the second adapter position.
- * Be sure to call {@link android.widget.BaseAdapter#notifyDataSetChanged()} if appropriate when implementing this method.
- *
- * @param positionOne First adapter position.
- * @param positionTwo Second adapter position.
- */
- public void swapItems(int positionOne, int positionTwo);
- }
-}
\ No newline at end of file
diff --git a/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/matchers/Matchers.java b/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/matchers/Matchers.java
deleted file mode 100644
index 1f0ab7b8..00000000
--- a/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/matchers/Matchers.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.nhaarman.listviewanimations.itemmanipulation.tests.matchers;
-
-import android.util.Pair;
-
-import org.hamcrest.Description;
-import org.hamcrest.Factory;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Matchers {
-
- @Factory
- public static Matcher> pairWithValues(T first, F second) {
- return new PairWithValues(first, second);
- }
-
- @Factory
- public static Matcher atomicIntegerWithValue(int value) {
- return new AtomicIntegerWithValue(value);
- }
-
- private static class PairWithValues extends TypeSafeMatcher> {
-
- private T first;
- private F second;
-
- public PairWithValues(T first, F second) {
- this.first = first;
- this.second = second;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("Dunno!");
- }
-
- @Override
- protected boolean matchesSafely(Pair tfPair) {
- return tfPair.first.equals(first) && tfPair.second.equals(second);
- }
- }
-
- private static class AtomicIntegerWithValue extends TypeSafeMatcher {
-
- private int mValue;
-
- public AtomicIntegerWithValue(int value) {
- mValue = value;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText(String.valueOf(mValue));
- }
-
- @Override
- protected boolean matchesSafely(AtomicInteger atomicInteger) {
- return mValue == atomicInteger.intValue();
- }
- }
-}
diff --git a/pom.xml b/pom.xml
index f11ece37..61950b56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,179 +1,277 @@
-
- 4.0.0
-
-
-