diff --git a/.gitignore b/.gitignore
index aed7fb2..6a25065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,12 @@ examples/PhotoGrid/bin/*
*.iml
out
gen
+
+# Gradle files
+.gradle/
+build/
+*/reports/*
+# Local configuration file (sdk path, etc)
+local.properties
+
+.DS_Store
diff --git a/Comcast Contributor License Agreement (03-07-14).pdf b/Comcast Contributor License Agreement (03-07-14).pdf
new file mode 100644
index 0000000..7874123
Binary files /dev/null and b/Comcast Contributor License Agreement (03-07-14).pdf differ
diff --git a/FreeFlow/.classpath b/FreeFlow/.classpath
new file mode 100644
index 0000000..5176974
--- /dev/null
+++ b/FreeFlow/.classpath
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/FreeFlow/.settings/org.eclipse.jdt.core.prefs b/FreeFlow/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b080d2d
--- /dev/null
+++ b/FreeFlow/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/FreeFlow/AndroidManifest.xml b/FreeFlow/AndroidManifest.xml
index 56c3bb6..35c8afb 100644
--- a/FreeFlow/AndroidManifest.xml
+++ b/FreeFlow/AndroidManifest.xml
@@ -20,15 +20,9 @@
android:versionName="1.0" >
+ android:minSdkVersion="14"
+ android:targetSdkVersion="21" />
-
-
+
diff --git a/FreeFlow/FreeFlow.iml b/FreeFlow/FreeFlow.iml
new file mode 100644
index 0000000..eccf30a
--- /dev/null
+++ b/FreeFlow/FreeFlow.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FreeFlow/build.gradle b/FreeFlow/build.gradle
new file mode 100644
index 0000000..1e0bdc5
--- /dev/null
+++ b/FreeFlow/build.gradle
@@ -0,0 +1,32 @@
+buildscript {
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.1.0'
+ }
+}
+apply plugin: 'com.android.library'
+
+repositories {
+ mavenLocal()
+ mavenCentral()
+}
+
+dependencies {
+ compile 'com.android.support:support-v4:21.0.2'
+}
+android {
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ }
+ }
+}
+android {
+ compileSdkVersion 21
+ buildToolsVersion '21.1.2'
+}
+repositories {
+ mavenLocal()
+ mavenCentral()
+}
+apply from: '../maven_push.gradle'
diff --git a/FreeFlow/gradle.properties b/FreeFlow/gradle.properties
new file mode 100644
index 0000000..dc64b2c
--- /dev/null
+++ b/FreeFlow/gradle.properties
@@ -0,0 +1,17 @@
+VERSION_NAME=1.0
+VERSION_CODE=1
+GROUP=com.comcast.freeflow
+POM_DESCRIPTION=FreeFlow Layout Library for Android
+POM_URL=https://github.com/Comcast/FreeFlow
+POM_SCM_URL=https://github.com/Comcast/FreeFlow
+POM_SCM_CONNECTION=scm:git@github.com:comcast/freeflow.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:comcast/comcast/freeflow.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=Comcast
+POM_DEVELOPER_NAME=Arpit Mathur
+POM_NAME=FreeFlow Layout Library
+POM_ARTIFACT_ID=freeflow
+POM_PACKAGING=aar
+
diff --git a/FreeFlow/res/drawable-hdpi/ic_launcher.png b/FreeFlow/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e..0000000
Binary files a/FreeFlow/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/FreeFlow/res/drawable-mdpi/ic_launcher.png b/FreeFlow/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047d..0000000
Binary files a/FreeFlow/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/FreeFlow/res/drawable-xhdpi/ic_launcher.png b/FreeFlow/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d76..0000000
Binary files a/FreeFlow/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/FreeFlow/res/layout/activity_main.xml b/FreeFlow/res/layout/activity_main.xml
deleted file mode 100644
index fed629c..0000000
--- a/FreeFlow/res/layout/activity_main.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
diff --git a/FreeFlow/res/menu/main.xml b/FreeFlow/res/menu/main.xml
deleted file mode 100644
index 110b8d3..0000000
--- a/FreeFlow/res/menu/main.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
diff --git a/FreeFlow/res/values-sw600dp/dimens.xml b/FreeFlow/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 37f8dc3..0000000
--- a/FreeFlow/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/FreeFlow/res/values-sw720dp-land/dimens.xml b/FreeFlow/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index bf389d5..0000000
--- a/FreeFlow/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- 128dp
-
-
diff --git a/FreeFlow/res/values-v11/styles.xml b/FreeFlow/res/values-v11/styles.xml
deleted file mode 100644
index 63f281a..0000000
--- a/FreeFlow/res/values-v11/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/FreeFlow/res/values-v14/styles.xml b/FreeFlow/res/values-v14/styles.xml
deleted file mode 100644
index 52dec45..0000000
--- a/FreeFlow/res/values-v14/styles.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/FreeFlow/res/values/dimens.xml b/FreeFlow/res/values/dimens.xml
deleted file mode 100644
index 8987eb3..0000000
--- a/FreeFlow/res/values/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- 16dp
- 16dp
-
-
diff --git a/FreeFlow/res/values/strings.xml b/FreeFlow/res/values/strings.xml
deleted file mode 100644
index 9682c8a..0000000
--- a/FreeFlow/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- FreeFlow
- Settings
- Hello world!
-
-
diff --git a/FreeFlow/res/values/styles.xml b/FreeFlow/res/values/styles.xml
deleted file mode 100644
index cd0a399..0000000
--- a/FreeFlow/res/values/styles.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/FreeFlow/src/com/comcast/freeflow/animations/DefaultLayoutAnimator.java b/FreeFlow/src/com/comcast/freeflow/animations/DefaultLayoutAnimator.java
index 0d10174..801bce6 100644
--- a/FreeFlow/src/com/comcast/freeflow/animations/DefaultLayoutAnimator.java
+++ b/FreeFlow/src/com/comcast/freeflow/animations/DefaultLayoutAnimator.java
@@ -18,10 +18,9 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.List;
-import com.comcast.freeflow.core.FreeFlowContainer;
-import com.comcast.freeflow.core.FreeFlowItem;
-import com.comcast.freeflow.core.LayoutChangeset;
+//import org.freeflow.BuildConfig;
import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
@@ -32,10 +31,15 @@
import android.graphics.Rect;
import android.util.Log;
import android.util.Pair;
+import android.view.MotionEvent;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.animation.DecelerateInterpolator;
+import com.comcast.freeflow.core.FreeFlowContainer;
+import com.comcast.freeflow.core.FreeFlowItem;
+import com.comcast.freeflow.core.LayoutChangeset;
+
public class DefaultLayoutAnimator implements FreeFlowLayoutAnimator {
protected LayoutChangeset changeSet;
@@ -97,7 +101,17 @@ public void cancel() {
if (movingSet != null)
movingSet.cancel();
+ for (FreeFlowItem item : changeSet.getAdded()) {
+ item.view.setAlpha(1f);
+ }
+ for (FreeFlowItem item : changeSet.getRemoved()) {
+ item.view.setAlpha(1f);
+ }
+
mIsRunning = false;
+
+
+
}
@@ -107,9 +121,6 @@ public void cancel() {
public void animateChanges(LayoutChangeset changeSet, final FreeFlowContainer callback) {
this.changeSet = changeSet;
this.callback = callback;
-
- Log.d(TAG, "Changes: " + changeSet.toString());
-
cancel();
mIsRunning = true;
@@ -126,13 +137,13 @@ public int compare(FreeFlowItem lhs, FreeFlowItem rhs) {
}
};
- ArrayList removed = changeSet.getRemoved();
+ List removed = changeSet.getRemoved();
if (removed.size() > 0) {
Collections.sort(removed, cmp);
disappearingSet = getItemsRemovedAnimation(changeSet.getRemoved());
}
- ArrayList added = changeSet.getAdded();
+ List added = changeSet.getAdded();
if (added.size() > 0) {
Collections.sort(added, cmp);
appearingSet = getItemsAddedAnimation(added);
@@ -181,7 +192,7 @@ public void onAnimationCancel(Animator animation) {
* An ArrayList of FreeFlowItems removed
* @return The AnimatorSet of the removed objects
*/
- protected AnimatorSet getItemsRemovedAnimation(ArrayList removed) {
+ protected AnimatorSet getItemsRemovedAnimation(List removed) {
AnimatorSet disappearingSet = new AnimatorSet();
ArrayList fades = new ArrayList();
for (FreeFlowItem proxy : removed) {
@@ -201,7 +212,7 @@ protected AnimatorSet getItemsRemovedAnimation(ArrayList removed)
/**
*
*/
- protected AnimatorSet getItemsAddedAnimation(ArrayList added) {
+ protected AnimatorSet getItemsAddedAnimation(List added) {
AnimatorSet appearingSet = new AnimatorSet();
ArrayList fadeIns = new ArrayList();
for (FreeFlowItem proxy : added) {
@@ -245,7 +256,7 @@ protected AnimatorSet getAnimationSequence() {
return allAnim;
}
- protected AnimatorSet getItemsMovedAnimation(ArrayList> moved) {
+ protected AnimatorSet getItemsMovedAnimation(List> moved) {
AnimatorSet anim = new AnimatorSet();
ArrayList moves = new ArrayList();
@@ -258,9 +269,6 @@ protected AnimatorSet getItemsMovedAnimation(ArrayList>
proxy.frame.right -= callback.getViewportLeft();
proxy.frame.bottom -= callback.getViewportTop();
- // Log.d(TAG, "vpx = " + callback.viewPortX + ", vpy = " +
- // callback.viewPortY);
-
moves.add(transitionToFrame(item.second, proxy, v));
}
@@ -273,9 +281,6 @@ protected AnimatorSet getItemsMovedAnimation(ArrayList>
public ValueAnimator transitionToFrame(final Rect of, final FreeFlowItem nf, final View v) {
ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
anim.setDuration(cellPositionTransitionAnimationDuration);
-//
-// Log.d(TAG, "of width = " + of.width() + ", nf width = " + nf.frame.width());
-// Log.d(TAG, "of height = " + of.height() + ", nf height = " + nf.frame.height());
anim.addUpdateListener(new AnimatorUpdateListener() {
@@ -311,7 +316,9 @@ public void onAnimationUpdate(ValueAnimator animation) {
// v.setAlpha((1 - alpha) * animation.getAnimatedFraction()
// + alpha);
} catch (NullPointerException e) {
- Log.e(TAG, "Nullpointer exception");
+ // if(BuildConfig.DEBUG){
+ // Log.e(TAG, "Nullpointer exception");
+ // }
e.printStackTrace();
animation.cancel();
}
@@ -337,4 +344,9 @@ public boolean isRunning() {
return mIsRunning;
}
+ @Override
+ public void onContainerTouchDown(MotionEvent event) {
+ cancel();
+ }
+
}
diff --git a/FreeFlow/src/com/comcast/freeflow/animations/FreeFlowLayoutAnimator.java b/FreeFlow/src/com/comcast/freeflow/animations/FreeFlowLayoutAnimator.java
index 8431bd7..8938898 100644
--- a/FreeFlow/src/com/comcast/freeflow/animations/FreeFlowLayoutAnimator.java
+++ b/FreeFlow/src/com/comcast/freeflow/animations/FreeFlowLayoutAnimator.java
@@ -15,6 +15,8 @@
******************************************************************************/
package com.comcast.freeflow.animations;
+import android.view.MotionEvent;
+
import com.comcast.freeflow.core.FreeFlowContainer;
import com.comcast.freeflow.core.LayoutChangeset;
@@ -48,11 +50,21 @@ public interface FreeFlowLayoutAnimator {
* The Container instance to be informed when your animations are
* complete
*/
- public void animateChanges(LayoutChangeset changes, FreeFlowContainer callback);
+ public void animateChanges(LayoutChangeset changes,
+ FreeFlowContainer callback);
/**
* @return Whether the layout animation is currently playing
*/
public boolean isRunning();
+ /**
+ * Called when a touch down event occurs while the layoutAnimator is
+ * animating. It gives you the first chance to exit or complete the
+ * animation since the Container might be about to be scrolled
+ *
+ * @param event The MotionEvent received by the Container
+ */
+ public void onContainerTouchDown(MotionEvent event);
+
}
diff --git a/FreeFlow/src/com/comcast/freeflow/animations/NoAnimationLayoutAnimator.java b/FreeFlow/src/com/comcast/freeflow/animations/NoAnimationLayoutAnimator.java
new file mode 100644
index 0000000..a4730a0
--- /dev/null
+++ b/FreeFlow/src/com/comcast/freeflow/animations/NoAnimationLayoutAnimator.java
@@ -0,0 +1,53 @@
+package com.comcast.freeflow.animations;
+
+import android.graphics.Rect;
+import android.util.Pair;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.MeasureSpec;
+
+import com.comcast.freeflow.core.FreeFlowContainer;
+import com.comcast.freeflow.core.FreeFlowItem;
+import com.comcast.freeflow.core.LayoutChangeset;
+
+public class NoAnimationLayoutAnimator implements FreeFlowLayoutAnimator {
+
+ private LayoutChangeset changes;
+
+ @Override
+ public LayoutChangeset getChangeSet() {
+ return changes;
+ }
+
+ @Override
+ public void cancel() {
+
+ }
+
+ @Override
+ public void animateChanges(LayoutChangeset changes,
+ FreeFlowContainer callback) {
+ this.changes = changes;
+ for(Pair item : changes.getMoved()){
+ Rect r = item.first.frame;
+ View v = item.first.view;
+ int wms = MeasureSpec.makeMeasureSpec(r.right-r.left, MeasureSpec.EXACTLY);
+ int hms = MeasureSpec.makeMeasureSpec(r.bottom-r.top, MeasureSpec.EXACTLY);
+ v.measure(wms,hms );
+ v.layout(r.left, r.top, r.right, r.bottom);
+ }
+ callback.onLayoutChangeAnimationsCompleted(this);
+
+ }
+
+ @Override
+ public boolean isRunning() {
+ return false;
+ }
+
+ @Override
+ public void onContainerTouchDown(MotionEvent event) {
+ cancel();
+ }
+
+}
diff --git a/FreeFlow/src/com/comcast/freeflow/animations/interpolators/EaseInOutQuintInterpolator.java b/FreeFlow/src/com/comcast/freeflow/animations/interpolators/EaseInOutQuintInterpolator.java
new file mode 100644
index 0000000..390c4a4
--- /dev/null
+++ b/FreeFlow/src/com/comcast/freeflow/animations/interpolators/EaseInOutQuintInterpolator.java
@@ -0,0 +1,15 @@
+package com.comcast.freeflow.animations.interpolators;
+
+import android.view.animation.Interpolator;
+
+public class EaseInOutQuintInterpolator implements Interpolator{
+
+ // easeInOutQuint
+ public float getInterpolation(float t) {
+ float x = t*2.0f;
+ if (t<0.5f) return 0.5f*x*x*x*x*x;
+ x = (t-0.5f)*2-1;
+ return 0.5f*x*x*x*x*x+1;
+ }
+
+}
diff --git a/FreeFlow/src/com/comcast/freeflow/core/AbsLayoutContainer.java b/FreeFlow/src/com/comcast/freeflow/core/AbsLayoutContainer.java
index 3021a04..218e805 100644
--- a/FreeFlow/src/com/comcast/freeflow/core/AbsLayoutContainer.java
+++ b/FreeFlow/src/com/comcast/freeflow/core/AbsLayoutContainer.java
@@ -33,7 +33,7 @@
public abstract class AbsLayoutContainer extends ViewGroup {
- protected HashMap frames = null;
+ protected Map frames = null;
protected ArrayList listeners = new ArrayList();
@@ -191,9 +191,9 @@ public void removeFreeFlowEventListener(FreeFlowEventListener listener) {
listeners.remove(listener);
}
- protected void dispatchAnimationsStarted() {
+ protected void dispatchAnimationsStarting() {
for (FreeFlowEventListener listener : listeners) {
- listener.animationsStarted();
+ listener.layoutChangeAnimationsStarting();
}
}
diff --git a/FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java b/FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java
index 43f1ea3..a193642 100644
--- a/FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java
+++ b/FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java
@@ -1,12 +1,12 @@
/*******************************************************************************
* Copyright 2013 Comcast Cable Communications Management, LLC
- *
+ *
* 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.
@@ -16,14 +16,17 @@
package com.comcast.freeflow.core;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Iterator;
import java.util.Map;
+//import org.freeflow.BuildConfig;
+
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.v4.util.SimpleArrayMap;
+import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Pair;
@@ -56,8 +59,8 @@ public class FreeFlowContainer extends AbsLayoutContainer {
// prevent layout in layout() method
private boolean preventLayout = false;
- protected SectionedAdapter itemAdapter;
- protected FreeFlowLayout layout;
+ protected SectionedAdapter mAdapter;
+ protected FreeFlowLayout mLayout;
/**
* The X position of the active ViewPort
@@ -90,7 +93,7 @@ public class FreeFlowContainer extends AbsLayoutContainer {
private int maxFlingVelocity;
private int minFlingVelocity;
private int overflingDistance;
- private int overscrollDistance;
+ /*private int overscrollDistance;*/
private int touchSlop;
private Runnable mTouchModeReset;
@@ -174,6 +177,13 @@ public class FreeFlowContainer extends AbsLayoutContainer {
private FreeFlowLayout oldLayout;
+ private OnTouchModeChangedListener mOnTouchModeChangedListener;
+
+ public void setOnTouchModeChangedListener(
+ OnTouchModeChangedListener onTouchModeChangedListener) {
+ mOnTouchModeChangedListener = onTouchModeChangedListener;
+ }
+
public FreeFlowContainer(Context context) {
super(context);
}
@@ -188,63 +198,106 @@ public FreeFlowContainer(Context context, AttributeSet attrs, int defStyle) {
@Override
protected void init(Context context) {
- // usedViews = new HashMap();
- // usedHeaderViews = new HashMap();
-
- setWillNotDraw(false);
viewpool = new ViewPool();
- frames = new HashMap();
+ frames = new LinkedHashMap();
ViewConfiguration configuration = ViewConfiguration.get(context);
maxFlingVelocity = configuration.getScaledMaximumFlingVelocity();
minFlingVelocity = configuration.getScaledMinimumFlingVelocity();
overflingDistance = configuration.getScaledOverflingDistance();
- overscrollDistance = configuration.getScaledOverscrollDistance();
+ /*overscrollDistance = configuration.getScaledOverscrollDistance();*/
touchSlop = configuration.getScaledTouchSlop();
scroller = new OverScroller(context);
- mLeftEdge = new EdgeEffect(context);
- mRightEdge = new EdgeEffect(context);
- mTopEdge = new EdgeEffect(context);
- mBottomEdge = new EdgeEffect(context);
+
+ setEdgeEffectsEnabled(true);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- logLifecycleEvent(this.getClass().getName()+" onMeasure ");
+ logLifecycleEvent(" onMeasure ");
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- int afterWidth = MeasureSpec.getSize(widthMeasureSpec);
- int afterHeight = MeasureSpec.getSize(heightMeasureSpec);
- if(this.layout != null){
- layout.setDimensions(afterWidth, afterHeight);
- }
+ int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+ int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+ int afterWidth = 0;
+ int afterHeight = 0;
+
+// int beforeWidth = getWidth();
+// int beforeHeight = getHeight();
+
+ afterWidth = MeasureSpec.getSize(widthMeasureSpec);
+ afterHeight = MeasureSpec.getSize(heightMeasureSpec);
+
- if (layout == null || itemAdapter == null
- || itemAdapter.getNumberOfSections() == 0){
+ // TODO: prepareLayout should at some point take sizeChanged as a param
+ // to not
+ // avoidable calculations
+
+ if (this.mLayout != null) {
+ mLayout.setDimensions(afterWidth, afterHeight);
+ }
+
+ if (mLayout == null || mAdapter == null) {
logLifecycleEvent("Nothing to do: returning");
return;
-
- }
-
+ }
+ if (widthMode != MeasureSpec.UNSPECIFIED && heightMode != MeasureSpec.UNSPECIFIED) {
+ markAdapterDirty = false;
+ markLayoutDirty = false;
+ computeLayout(afterWidth, afterHeight);
+ }
- if (markAdapterDirty || markLayoutDirty) {
- computeLayout(afterWidth, afterHeight);
+ if (dataSetChanged) {
+ dataSetChanged = false;
+ for (FreeFlowItem item : frames.values()) {
+ if (item.itemIndex >= 0 && item.itemSection >= 0) {
+ mAdapter.getItemView(item.itemSection, item.itemIndex,
+ item.view, this);
+ }
+ }
}
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ protected boolean dataSetChanged = false;
+
+ /**
+ * Notifies the attached observers that the underlying data has been changed
+ * and any View reflecting the data set should refresh itself.
+ */
+ public void notifyDataSetChanged() {
+ dataSetChanged = true;
+ requestLayout();
}
+ /**
+ * @deprecated Use dataInvalidated(boolean shouldRecalculateScrollPositions)
+ * instead
+ */
public void dataInvalidated() {
- logLifecycleEvent( "Data Invalidated");
- if (layout == null || itemAdapter == null) {
+ dataInvalidated(false);
+ }
+
+ /**
+ * Called to inform the Container that the underlying data on the adapter
+ * has changed (more items added/removed). Note that this won't update the
+ * views if the adapter's data objects are the same but the values in those
+ * objects have changed. To update those call {@code notifyDataSetChanged}
+ *
+ * @param shouldRecalculateScrollPositions
+ */
+ public void dataInvalidated(boolean shouldRecalculateScrollPositions) {
+ logLifecycleEvent("Data Invalidated");
+ if (mLayout == null || mAdapter == null) {
return;
}
- shouldRecalculateScrollWhenComputingLayout = false;
+ shouldRecalculateScrollWhenComputingLayout = shouldRecalculateScrollPositions;
markAdapterDirty = true;
requestLayout();
}
@@ -262,19 +315,14 @@ public void dataInvalidated() {
* margins and padding, this is height of the container.
*/
protected void computeLayout(int w, int h) {
- markLayoutDirty = false;
- markAdapterDirty = false;
-
- logLifecycleEvent( "Computing layout for "
- + itemAdapter.getSection(0).getDataCount());
- layout.prepareLayout();
+ mLayout.prepareLayout();
if (shouldRecalculateScrollWhenComputingLayout) {
- computeViewPort(layout);
+ computeViewPort(mLayout);
}
- HashMap oldFrames = frames;
+ Map oldFrames = frames;
- frames = new HashMap();
- copyFrames(layout.getItemProxies(viewPortX, viewPortY), frames);
+ frames = new LinkedHashMap();
+ copyFrames(mLayout.getItemProxies(viewPortX, viewPortY), frames);
// Create a copy of the incoming values because the source
// layout may change the map inside its own class
@@ -285,11 +333,11 @@ protected void computeLayout(int w, int h) {
}
/**
- * Copies the frames from one HashMap into another. The items are cloned
- * cause we modify the rectangles of the items as they are moving
+ * Copies the frames from one LinkedHashMap into another. The items are
+ * cloned cause we modify the rectangles of the items as they are moving
*/
- protected void copyFrames(HashMap srcFrames,
- HashMap destFrames) {
+ protected void copyFrames(Map srcFrames,
+ Map destFrames) {
Iterator it = srcFrames.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pairs = (Map.Entry) it.next();
@@ -312,14 +360,14 @@ protected void addAndMeasureViewIfNeeded(FreeFlowItem freeflowItem) {
View view;
if (freeflowItem.view == null) {
- View convertView = viewpool.getViewFromPool(itemAdapter
+ View convertView = viewpool.getViewFromPool(mAdapter
.getViewType(freeflowItem));
if (freeflowItem.isHeader) {
- view = itemAdapter.getHeaderViewForSection(
+ view = mAdapter.getHeaderViewForSection(
freeflowItem.itemSection, convertView, this);
} else {
- view = itemAdapter.getItemView(freeflowItem.itemSection,
+ view = mAdapter.getItemView(freeflowItem.itemSection,
freeflowItem.itemIndex, convertView, this);
}
@@ -359,7 +407,7 @@ protected void prepareViewForAddition(View view, FreeFlowItem freeflowItem) {
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
- logLifecycleEvent( "onLayout");
+ logLifecycleEvent("onLayout");
dispatchLayoutComplete(isAnimatingChanges);
// mDataChanged = false;
@@ -378,37 +426,75 @@ protected void doLayout(FreeFlowItem freeflowItem) {
* Scroll positions will also be reset.
*
* @see FreeFlowLayout
- * @param lc
+ * @param newLayout
*/
- public void setLayout(FreeFlowLayout lc) {
-
- if (lc == layout) {
+ public void setLayout(FreeFlowLayout newLayout) {
+ if (newLayout == mLayout || newLayout == null) {
return;
}
-
- oldLayout = layout;
- layout = lc;
+ stopScrolling();
+ oldLayout = mLayout;
+ mLayout = newLayout;
shouldRecalculateScrollWhenComputingLayout = true;
- if (itemAdapter != null) {
- layout.setAdapter(itemAdapter);
+ if (mAdapter != null) {
+ mLayout.setAdapter(mAdapter);
}
- dispatchLayoutChanging(oldLayout, lc);
+ dispatchLayoutChanging(oldLayout, newLayout);
markLayoutDirty = true;
viewPortX = 0;
viewPortY = 0;
- logLifecycleEvent( "Setting layout");
+ logLifecycleEvent("Setting layout");
requestLayout();
}
+ /**
+ * Stops the scrolling immediately
+ */
+ public void stopScrolling() {
+ if (!scroller.isFinished()) {
+ scroller.forceFinished(true);
+ }
+ removeCallbacks(flingRunnable);
+ resetAllCallbacks();
+ mTouchMode = TOUCH_MODE_REST;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
+ }
+ }
+
+ /**
+ * Resets all Runnables that are checking on various statuses
+ */
+ protected void resetAllCallbacks() {
+ if (mPendingCheckForTap != null) {
+ removeCallbacks(mPendingCheckForTap);
+ mPendingCheckForTap = null;
+ }
+
+ if (mPendingCheckForLongPress != null) {
+ removeCallbacks(mPendingCheckForLongPress);
+ mPendingCheckForLongPress = null;
+ }
+ if (mTouchModeReset != null) {
+ removeCallbacks(mTouchModeReset);
+ mTouchModeReset = null;
+ }
+ if (mPerformClick != null) {
+ removeCallbacks(mPerformClick);
+ mPerformClick = null;
+ }
+ }
+
/**
* @return The layout currently applied to the Container
*/
public FreeFlowLayout getLayout() {
- return layout;
+ return mLayout;
}
/**
@@ -420,8 +506,8 @@ public FreeFlowLayout getLayout() {
* @see getViewportLeft
*
*/
- private void computeViewPort(FreeFlowLayout newLayout) {
- if (layout == null || frames == null || frames.size() == 0) {
+ protected void computeViewPort(FreeFlowLayout newLayout) {
+ if (mLayout == null || frames == null || frames.size() == 0) {
viewPortX = 0;
viewPortY = 0;
return;
@@ -458,8 +544,8 @@ private void computeViewPort(FreeFlowLayout newLayout) {
viewPortX = vpFrame.left;
viewPortY = vpFrame.top;
- mScrollableWidth = layout.getContentWidth() - getWidth();
- mScrollableHeight = layout.getContentHeight() - getHeight();
+ mScrollableWidth = mLayout.getContentWidth() - getWidth();
+ mScrollableHeight = mLayout.getContentHeight() - getHeight();
if (mScrollableWidth < 0) {
mScrollableWidth = 0;
@@ -501,12 +587,30 @@ public Rect getActualFrame(final FreeFlowItem freeflowItem) {
}
+ /**
+ * Returns the FreeFlowItem representing the data passed in IF
+ * that item is being rendered in the Container.
+ *
+ * @param dataItem
+ * The data object being rendered in a View managed by the
+ * Container, null otherwise
+ * @return
+ */
+ public FreeFlowItem getFreeFlowItem(Object dataItem) {
+ for (FreeFlowItem item : frames.values()) {
+ if (item.data.equals(dataItem)) {
+ return item;
+ }
+ }
+ return null;
+ }
+
/**
* TODO: This should be renamed to layoutInvalidated, since the layout isn't
* changed
*/
public void layoutChanged() {
- logLifecycleEvent( "layoutChanged");
+ logLifecycleEvent("layoutChanged");
markLayoutDirty = true;
dispatchDataChanged();
requestLayout();
@@ -515,8 +619,7 @@ public void layoutChanged() {
protected boolean isAnimatingChanges = false;
private void animateChanges(LayoutChangeset changeSet) {
- logLifecycleEvent(
- "animating changes: " + changeSet.toString());
+ logLifecycleEvent("animating changes: " + changeSet.toString());
if (changeSet.added.size() == 0 && changeSet.removed.size() == 0
&& changeSet.moved.size() == 0) {
return;
@@ -532,7 +635,7 @@ private void animateChanges(LayoutChangeset changeSet) {
}
isAnimatingChanges = true;
- dispatchAnimationsStarted();
+ dispatchAnimationsStarting();
layoutAnimator.animateChanges(changeSet, this);
@@ -548,8 +651,7 @@ private void animateChanges(LayoutChangeset changeSet) {
public void onLayoutChangeAnimationsCompleted(FreeFlowLayoutAnimator anim) {
// preventLayout = false;
isAnimatingChanges = false;
- logLifecycleEvent(
- "layout change animations complete");
+ logLifecycleEvent("layout change animations complete");
for (FreeFlowItem freeflowItem : anim.getChangeSet().getRemoved()) {
View v = freeflowItem.view;
removeView(v);
@@ -562,15 +664,13 @@ public void onLayoutChangeAnimationsCompleted(FreeFlowLayoutAnimator anim) {
}
- public LayoutChangeset getViewChanges(
- HashMap oldFrames,
- HashMap newFrames) {
+ public LayoutChangeset getViewChanges(Map oldFrames,
+ Map newFrames) {
return getViewChanges(oldFrames, newFrames, false);
}
- public LayoutChangeset getViewChanges(
- HashMap oldFrames,
- HashMap newFrames, boolean moveEvenIfSame) {
+ public LayoutChangeset getViewChanges(Map oldFrames,
+ Map newFrames, boolean moveEvenIfSame) {
// cleanupViews();
LayoutChangeset change = new LayoutChangeset();
@@ -653,27 +753,28 @@ public void requestLayout() {
* Collection
*/
public void setAdapter(SectionedAdapter adapter) {
- if (adapter == itemAdapter) {
+ if (adapter == mAdapter) {
return;
}
- logLifecycleEvent( "setting adapter");
+ stopScrolling();
+ logLifecycleEvent("setting adapter");
markAdapterDirty = true;
viewPortX = 0;
viewPortY = 0;
shouldRecalculateScrollWhenComputingLayout = true;
- this.itemAdapter = adapter;
+ this.mAdapter = adapter;
if (adapter != null) {
viewpool.initializeViewPool(adapter.getViewTypes());
}
- if (layout != null) {
- layout.setAdapter(itemAdapter);
+ if (mLayout != null) {
+ mLayout.setAdapter(mAdapter);
}
requestLayout();
}
public FreeFlowLayout getLayoutController() {
- return layout;
+ return mLayout;
}
/**
@@ -759,20 +860,44 @@ public int getViewportTop() {
public boolean onTouchEvent(MotionEvent event) {
super.onTouchEvent(event);
- if (layout == null)
+ if (mLayout == null) {
return false;
+ }
+ // flag to check if laid out items are wide or tall enough
+ // to require scrolling
boolean canScroll = false;
- if (layout.horizontalScrollEnabled()
- && this.layout.getContentWidth() > getWidth()) {
+ if (mLayout.horizontalScrollEnabled()
+ && this.mLayout.getContentWidth() > getWidth()) {
canScroll = true;
}
- if (layout.verticalScrollEnabled()
- && layout.getContentHeight() > getHeight()) {
+ if (mLayout.verticalScrollEnabled()
+ && mLayout.getContentHeight() > getHeight()) {
canScroll = true;
}
+ switch (event.getAction()) {
+ case (MotionEvent.ACTION_DOWN):
+ touchDown(event);
+ break;
+ case (MotionEvent.ACTION_MOVE):
+ if (canScroll) {
+ touchMove(event);
+ }
+ break;
+ case (MotionEvent.ACTION_UP):
+ touchUp(event);
+ break;
+ case (MotionEvent.ACTION_CANCEL):
+ touchCancel(event);
+ break;
+ }
+
+ if (!canScroll) {
+ return true;
+ }
+
if (mVelocityTracker == null && canScroll) {
mVelocityTracker = VelocityTracker.obtain();
}
@@ -780,154 +905,244 @@ public boolean onTouchEvent(MotionEvent event) {
mVelocityTracker.addMovement(event);
}
- if (event.getAction() == MotionEvent.ACTION_DOWN) {
+ return true;
- if (mTouchMode == TOUCH_MODE_FLING) {
- // Wait for some time to see if the user is just trying
- // to speed up the scroll
- postDelayed(new Runnable() {
- @Override
- public void run() {
+ }
+
+ protected void touchDown(MotionEvent event) {
+ if(isAnimatingChanges){
+ layoutAnimator.onContainerTouchDown(event);
+ }
+
+
+ /*
+ * Recompute this just to be safe. TODO: We should optimize this to be
+ * only calculated when a data or layout change happens
+ */
+ mScrollableHeight = mLayout.getContentHeight() - getHeight();
+ mScrollableWidth = mLayout.getContentWidth() - getWidth();
+
+ if (mTouchMode == TOUCH_MODE_FLING) {
+ // Wait for some time to see if the user is just trying
+ // to speed up the scroll
+ postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ if (mTouchMode == TOUCH_MODE_DOWN) {
if (mTouchMode == TOUCH_MODE_DOWN) {
- if (mTouchMode == TOUCH_MODE_DOWN) {
- scroller.forceFinished(true);
- }
+ scroller.forceFinished(true);
}
}
- }, FLYWHEEL_TIMEOUT);
- }
+ }
+ }, FLYWHEEL_TIMEOUT);
+ }
- beginTouchAt = ViewUtils.getItemAt(frames,
- (int) (viewPortX + event.getX()),
- (int) (viewPortY + event.getY()));
+ beginTouchAt = ViewUtils.getItemAt(frames,
+ (int) (viewPortX + event.getX()),
+ (int) (viewPortY + event.getY()));
- if (canScroll) {
- deltaX = event.getX();
- deltaY = event.getY();
- }
- mTouchMode = TOUCH_MODE_DOWN;
+ deltaX = event.getX();
+ deltaY = event.getY();
- if (mPendingCheckForTap != null) {
- removeCallbacks(mPendingCheckForTap);
- mPendingCheckForLongPress = null;
- }
+ mTouchMode = TOUCH_MODE_DOWN;
- if (beginTouchAt != null) {
- mPendingCheckForTap = new CheckForTap();
- }
- postDelayed(mPendingCheckForTap, ViewConfiguration.getTapTimeout());
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
+ }
- return true;
+ if (mPendingCheckForTap != null) {
+ removeCallbacks(mPendingCheckForTap);
+ mPendingCheckForLongPress = null;
+ }
- } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+ if (beginTouchAt != null) {
+ mPendingCheckForTap = new CheckForTap();
+ }
+ postDelayed(mPendingCheckForTap, ViewConfiguration.getTapTimeout());
- if (canScroll) {
- float xDiff = event.getX() - deltaX;
- float yDiff = event.getY() - deltaY;
+ }
- double distance = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
- if ((mTouchMode == TOUCH_MODE_DOWN || mTouchMode == TOUCH_MODE_REST)
- && distance > touchSlop) {
- mTouchMode = TOUCH_MODE_SCROLL;
+ protected void touchMove(MotionEvent event) {
+ float xDiff = event.getX() - deltaX;
+ float yDiff = event.getY() - deltaY;
- if (mPendingCheckForTap != null) {
- removeCallbacks(mPendingCheckForTap);
- mPendingCheckForTap = null;
- }
+ double distance = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
+ if (mLayout.verticalScrollEnabled()) {
+ if (yDiff > 0 && viewPortY == 0) {
+ if (mEdgeEffectsEnabled) {
+ float str = (float) distance / getHeight();
+ mTopEdge.onPull(str);
+ invalidate();
}
+ return;
+ }
- if (mTouchMode == TOUCH_MODE_SCROLL) {
- moveViewportBy(event.getX() - deltaX,
- event.getY() - deltaY, false);
- invokeOnItemScrollListeners();
- deltaX = event.getX();
- deltaY = event.getY();
+ if (yDiff < 0 && viewPortY == mScrollableHeight) {
+ if (mEdgeEffectsEnabled) {
+ float str = (float) distance / getHeight();
+ mBottomEdge.onPull(str);
+ invalidate();
}
+ return;
}
+ }
- return true;
+ if (mLayout.horizontalScrollEnabled()) {
+ if (xDiff > 0 && viewPortX == 0) {
+ if (mEdgeEffectsEnabled) {
+ float str = (float) distance / getWidth();
+ mLeftEdge.onPull(str);
+ invalidate();
+ }
+ return;
+ }
- } else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
- mTouchMode = TOUCH_MODE_REST;
+ if (xDiff < 0 && viewPortY == mScrollableWidth) {
+ if (mEdgeEffectsEnabled) {
+ float str = (float) distance / getWidth();
+ mRightEdge.onPull(str);
+ invalidate();
+ }
+ return;
+ }
+ }
- if (canScroll) {
- mVelocityTracker.recycle();
- mVelocityTracker = null;
+ if ((mTouchMode == TOUCH_MODE_DOWN || mTouchMode == TOUCH_MODE_REST)
+ && distance > touchSlop) {
+ mTouchMode = TOUCH_MODE_SCROLL;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
}
- // requestLayout();
+ if (mPendingCheckForTap != null) {
+ removeCallbacks(mPendingCheckForTap);
+ mPendingCheckForTap = null;
+ }
- return true;
+ }
- } else if (event.getAction() == MotionEvent.ACTION_UP) {
+ if (mTouchMode == TOUCH_MODE_SCROLL) {
+ moveViewportBy(event.getX() - deltaX, event.getY() - deltaY, false);
+ deltaX = event.getX();
+ deltaY = event.getY();
+ }
+ }
- if (mTouchMode == TOUCH_MODE_SCROLL) {
- mVelocityTracker.computeCurrentVelocity(1000, maxFlingVelocity);
- if (Math.abs(mVelocityTracker.getXVelocity()) > minFlingVelocity
- || Math.abs(mVelocityTracker.getYVelocity()) > minFlingVelocity) {
+ protected void touchCancel(MotionEvent event) {
+ mTouchMode = TOUCH_MODE_REST;
- int maxX = layout.getContentWidth() - getWidth();
- int maxY = layout.getContentHeight() - getHeight();
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
+ }
- scroller.fling(viewPortX, viewPortY,
- -(int) mVelocityTracker.getXVelocity(),
- -(int) mVelocityTracker.getYVelocity(), 0, maxX, 0,
- maxY, overflingDistance, overflingDistance);
+ if (mVelocityTracker != null) {
+ mVelocityTracker.recycle();
+ mVelocityTracker = null;
+ }
+
+ // requestLayout();
- mTouchMode = TOUCH_MODE_FLING;
- post(flingRunnable);
+ }
+ protected void touchUp(MotionEvent event) {
+ if ((mTouchMode == TOUCH_MODE_SCROLL || mTouchMode == TOUCH_MODE_OVERFLING)
+ && mVelocityTracker != null) {
+
+ mVelocityTracker.computeCurrentVelocity(1000, maxFlingVelocity);
+
+ if (Math.abs(mVelocityTracker.getXVelocity()) > minFlingVelocity
+ || Math.abs(mVelocityTracker.getYVelocity()) > minFlingVelocity) {
+
+ int maxX = mLayout.getContentWidth() - getWidth();
+ int maxY = mLayout.getContentHeight() - getHeight();
+
+ int allowedScrollOffset;
+ if (mTouchMode == TOUCH_MODE_SCROLL) {
+ allowedScrollOffset = 0;
} else {
- mTouchMode = TOUCH_MODE_REST;
+ allowedScrollOffset = overflingDistance;
}
- } else if (mTouchMode == TOUCH_MODE_DOWN
- || mTouchMode == TOUCH_MODE_DONE_WAITING) {
- if (mTouchModeReset != null) {
- removeCallbacks(mTouchModeReset);
+ scroller.fling(viewPortX, viewPortY,
+ -(int) mVelocityTracker.getXVelocity(),
+ -(int) mVelocityTracker.getYVelocity(), 0, maxX, 0,
+ maxY, allowedScrollOffset, allowedScrollOffset);
+
+ mTouchMode = TOUCH_MODE_FLING;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
}
- if (beginTouchAt != null && beginTouchAt.view != null) {
- beginTouchAt.view.setPressed(true);
- mTouchModeReset = new Runnable() {
- @Override
- public void run() {
- mTouchModeReset = null;
- mTouchMode = TOUCH_MODE_REST;
- if (beginTouchAt != null
- && beginTouchAt.view != null) {
- beginTouchAt.view.setPressed(false);
- }
- if (mChoiceActionMode == null
- && mOnItemSelectedListener != null) {
- mOnItemSelectedListener.onItemSelected(
- FreeFlowContainer.this, selectedFreeFlowItem);
- }
-
- // setPressed(false);
- // if (!mDataChanged) {
- mPerformClick = new PerformClick();
- mPerformClick.run();
- // }
- }
- };
- selectedFreeFlowItem = beginTouchAt;
- postDelayed(mTouchModeReset,
- ViewConfiguration.getPressedStateDuration());
+ post(flingRunnable);
- mTouchMode = TOUCH_MODE_TAP;
- } else {
- mTouchMode = TOUCH_MODE_REST;
+ } else {
+ mTouchMode = TOUCH_MODE_REST;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
}
+ }
+ } else if (mTouchMode == TOUCH_MODE_DOWN
+ || mTouchMode == TOUCH_MODE_DONE_WAITING) {
+ if (mTouchModeReset != null) {
+ removeCallbacks(mTouchModeReset);
}
- return true;
- }
+ FreeFlowItem endTouchAt = ViewUtils.getItemAt(frames,
+ (int) (viewPortX + event.getX()),
+ (int) (viewPortY + event.getY()));
- return false;
+ if (beginTouchAt != null && beginTouchAt.view != null
+ && beginTouchAt == endTouchAt) {
+ beginTouchAt.view.setPressed(true);
+
+ mTouchModeReset = new Runnable() {
+ @Override
+ public void run() {
+ mTouchModeReset = null;
+ mTouchMode = TOUCH_MODE_REST;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener
+ .onTouchModeChanged(mTouchMode);
+ }
+
+ if (beginTouchAt != null && beginTouchAt.view != null) {
+ beginTouchAt.view.setPressed(false);
+ }
+ if (mChoiceActionMode == null
+ && mOnItemSelectedListener != null) {
+ mOnItemSelectedListener.onItemSelected(
+ FreeFlowContainer.this,
+ selectedFreeFlowItem);
+ }
+ }
+ };
+ selectedFreeFlowItem = beginTouchAt;
+ postDelayed(mTouchModeReset,
+ ViewConfiguration.getPressedStateDuration());
+
+ mTouchMode = TOUCH_MODE_TAP;
+ mPerformClick = new PerformClick();
+ mPerformClick.run();
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
+ }
+ } else {
+ mTouchMode = TOUCH_MODE_REST;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
+ }
+ }
+
+ }
}
public FreeFlowItem getSelectedFreeFlowItem() {
@@ -940,15 +1155,22 @@ public FreeFlowItem getSelectedFreeFlowItem() {
public void run() {
if (scroller.isFinished()) {
mTouchMode = TOUCH_MODE_REST;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
+ }
+
invokeOnItemScrollListeners();
return;
}
boolean more = scroller.computeScrollOffset();
- checkEdgeEffectDuringScroll();
- if (layout.horizontalScrollEnabled()) {
+ if (mEdgeEffectsEnabled) {
+ checkEdgeEffectDuringScroll();
+ }
+ if (mLayout.horizontalScrollEnabled()) {
viewPortX = scroller.getCurrX();
}
- if (layout.verticalScrollEnabled()) {
+ if (mLayout.verticalScrollEnabled()) {
viewPortY = scroller.getCurrY();
}
moveViewport(true);
@@ -960,24 +1182,24 @@ public void run() {
protected void checkEdgeEffectDuringScroll() {
if (mLeftEdge.isFinished() && viewPortX < 0
- && layout.horizontalScrollEnabled()) {
+ && mLayout.horizontalScrollEnabled()) {
mLeftEdge.onAbsorb((int) scroller.getCurrVelocity());
}
if (mRightEdge.isFinished()
- && viewPortX > layout.getContentWidth() - getMeasuredWidth()
- && layout.horizontalScrollEnabled()) {
+ && viewPortX > mLayout.getContentWidth() - getMeasuredWidth()
+ && mLayout.horizontalScrollEnabled()) {
mRightEdge.onAbsorb((int) scroller.getCurrVelocity());
}
if (mTopEdge.isFinished() && viewPortY < 0
- && layout.verticalScrollEnabled()) {
+ && mLayout.verticalScrollEnabled()) {
mTopEdge.onAbsorb((int) scroller.getCurrVelocity());
}
if (mBottomEdge.isFinished()
- && viewPortY > layout.getContentHeight() - getMeasuredHeight()
- && layout.verticalScrollEnabled()) {
+ && viewPortY > mLayout.getContentHeight() - getMeasuredHeight()
+ && mLayout.verticalScrollEnabled()) {
mBottomEdge.onAbsorb((int) scroller.getCurrVelocity());
}
@@ -986,11 +1208,11 @@ protected void checkEdgeEffectDuringScroll() {
protected void moveViewportBy(float movementX, float movementY,
boolean fling) {
- if (layout.horizontalScrollEnabled()) {
+ if (mLayout.horizontalScrollEnabled()) {
viewPortX = (int) (viewPortX - movementX);
}
- if (layout.verticalScrollEnabled()) {
+ if (mLayout.verticalScrollEnabled()) {
viewPortY = (int) (viewPortY - movementY);
}
moveViewport(fling);
@@ -1010,16 +1232,22 @@ protected void moveViewPort(int left, int top, boolean isInFlingMode) {
*/
protected void moveViewport(boolean isInFlingMode) {
- mScrollableWidth = layout.getContentWidth() - getWidth();
+ mScrollableWidth = mLayout.getContentWidth() - getWidth();
if (mScrollableWidth < 0) {
mScrollableWidth = 0;
}
- mScrollableHeight = layout.getContentHeight() - getHeight();
+ mScrollableHeight = mLayout.getContentHeight() - getHeight();
if (mScrollableHeight < 0) {
mScrollableHeight = 0;
}
- if (!isInFlingMode && overflingDistance > 0) {
+ if (isInFlingMode) {
+ if (viewPortX < 0 || viewPortX > mScrollableWidth || viewPortY < 0
+ || viewPortY > mScrollableHeight) {
+ mTouchMode = TOUCH_MODE_OVERFLING;
+ }
+ } else {
+
if (viewPortX < -overflingDistance) {
viewPortX = -overflingDistance;
} else if (viewPortX > mScrollableWidth + overflingDistance) {
@@ -1032,26 +1260,27 @@ protected void moveViewport(boolean isInFlingMode) {
viewPortY = (int) (mScrollableHeight + overflingDistance);
}
- if (viewPortX <= 0) {
- mLeftEdge.onPull(viewPortX / (-overflingDistance));
- } else if (viewPortX >= mScrollableWidth) {
- mRightEdge.onPull((viewPortX - mScrollableWidth)
- / (-overflingDistance));
- }
+ if (mEdgeEffectsEnabled && overflingDistance > 0) {
+ if (viewPortX <= 0) {
+ mLeftEdge.onPull(viewPortX / (-overflingDistance));
+ } else if (viewPortX >= mScrollableWidth) {
+ mRightEdge.onPull((viewPortX - mScrollableWidth)
+ / (-overflingDistance));
+ }
- if (viewPortY <= 0) {
- mTopEdge.onPull(viewPortY / (-overflingDistance));
- } else if (viewPortY >= mScrollableHeight) {
- mBottomEdge.onPull((viewPortY - mScrollableHeight)
- / (-overflingDistance));
+ if (viewPortY <= 0) {
+ mTopEdge.onPull(viewPortY / (-overflingDistance));
+ } else if (viewPortY >= mScrollableHeight) {
+ mBottomEdge.onPull((viewPortY - mScrollableHeight)
+ / (-overflingDistance));
+ }
}
-
}
- HashMap oldFrames = new HashMap();
+ LinkedHashMap oldFrames = new LinkedHashMap();
copyFrames(frames, oldFrames);
- frames = new HashMap();
- copyFrames(layout.getItemProxies(viewPortX, viewPortY), frames);
+ frames = new LinkedHashMap();
+ copyFrames(mLayout.getItemProxies(viewPortX, viewPortY), frames);
LayoutChangeset changeSet = getViewChanges(oldFrames, frames, true);
@@ -1065,18 +1294,37 @@ protected void moveViewport(boolean isInFlingMode) {
}
for (FreeFlowItem freeflowItem : changeSet.removed) {
- freeflowItem.view.setAlpha(0.3f);
removeViewInLayout(freeflowItem.view);
returnItemToPoolIfNeeded(freeflowItem);
}
invalidate();
+ invokeOnItemScrollListeners();
+ }
+ protected boolean mEdgeEffectsEnabled = true;
+
+ /**
+ * Controls whether the edge glows are enabled or not
+ */
+ public void setEdgeEffectsEnabled(boolean val) {
+ mEdgeEffectsEnabled = val;
+ if (val) {
+ Context context = getContext();
+ setWillNotDraw(false);
+ mLeftEdge = new EdgeEffect(context);
+ mRightEdge = new EdgeEffect(context);
+ mTopEdge = new EdgeEffect(context);
+ mBottomEdge = new EdgeEffect(context);
+ } else {
+ setWillNotDraw(true);
+ mLeftEdge = mRightEdge = mTopEdge = mBottomEdge = null;
+ }
}
@Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
+ public void draw(Canvas canvas) {
+ super.draw(canvas);
boolean needsInvalidate = false;
@@ -1127,9 +1375,9 @@ protected void onDraw(Canvas canvas) {
canvas.restoreToCount(restoreCount);
}
- if (needsInvalidate)
- postInvalidateOnAnimation();
-
+ if (needsInvalidate) {
+ ViewCompat.postInvalidateOnAnimation(this);
+ }
}
protected void returnItemToPoolIfNeeded(FreeFlowItem freeflowItem) {
@@ -1139,13 +1387,12 @@ protected void returnItemToPoolIfNeeded(FreeFlowItem freeflowItem) {
v.setRotation(0);
v.setScaleX(1f);
v.setScaleY(1f);
-
v.setAlpha(1);
viewpool.returnViewToPool(v);
}
public SectionedAdapter getAdapter() {
- return itemAdapter;
+ return mAdapter;
}
public void setLayoutAnimator(FreeFlowLayoutAnimator anim) {
@@ -1156,7 +1403,7 @@ public FreeFlowLayoutAnimator getLayoutAnimator() {
return layoutAnimator;
}
- public HashMap getFrames() {
+ public Map getFrames() {
return frames;
}
@@ -1235,6 +1482,11 @@ final class CheckForTap implements Runnable {
public void run() {
if (mTouchMode == TOUCH_MODE_DOWN) {
mTouchMode = TOUCH_MODE_TAP;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener.onTouchModeChanged(mTouchMode);
+ }
+
if (beginTouchAt != null && beginTouchAt.view != null) {
beginTouchAt.view.setPressed(true);
// setPressed(true);
@@ -1252,6 +1504,11 @@ public void run() {
postDelayed(mPendingCheckForLongPress, longPressTimeout);
} else {
mTouchMode = TOUCH_MODE_DONE_WAITING;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener
+ .onTouchModeChanged(mTouchMode);
+ }
}
}
}
@@ -1275,10 +1532,21 @@ public void run() {
// }
if (handled) {
mTouchMode = TOUCH_MODE_REST;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener
+ .onTouchModeChanged(mTouchMode);
+ }
+
// setPressed(false);
child.setPressed(false);
} else {
mTouchMode = TOUCH_MODE_DONE_WAITING;
+
+ if (mOnTouchModeChangedListener != null) {
+ mOnTouchModeChangedListener
+ .onTouchModeChanged(mTouchMode);
+ }
}
}
}
@@ -1298,8 +1566,8 @@ boolean performLongPress() {
}
boolean handled = false;
- final long longPressId = itemAdapter.getItemId(
- beginTouchAt.itemSection, beginTouchAt.itemSection);
+ final long longPressId = mAdapter.getItemId(beginTouchAt.itemSection,
+ beginTouchAt.itemSection);
if (mOnItemLongClickListener != null) {
handled = mOnItemLongClickListener.onItemLongClick(this,
beginTouchAt.view, beginTouchAt.itemSection,
@@ -1385,6 +1653,10 @@ public void onItemCheckedStateChanged(ActionMode mode, int section,
}
}
+ public interface OnTouchModeChangedListener {
+ void onTouchModeChanged(int touchMode);
+ }
+
public interface MultiChoiceModeListener extends ActionMode.Callback {
/**
* Called when an item is checked or unchecked during selection mode.
@@ -1406,6 +1678,14 @@ public void onItemCheckedStateChanged(ActionMode mode, int section,
int position, long id, boolean checked);
}
+ @Override
+ public void setOnItemLongClickListener(OnItemLongClickListener listener) {
+ super.setOnItemLongClickListener(listener);
+ if (mCheckStates==null) {
+ mCheckStates = new SimpleArrayMap();
+ }
+ }
+
public void setItemChecked(int sectionIndex, int positionInSection,
boolean value) {
if (mChoiceMode == CHOICE_MODE_NONE) {
@@ -1431,7 +1711,7 @@ public void setItemChecked(int sectionIndex, int positionInSection,
setCheckedValue(sectionIndex, positionInSection, value);
if (mChoiceActionMode != null) {
- final long id = itemAdapter.getItemId(sectionIndex,
+ final long id = mAdapter.getItemId(sectionIndex,
positionInSection);
mMultiChoiceModeCallback.onItemCheckedStateChanged(
mChoiceActionMode, sectionIndex, positionInSection, id,
@@ -1497,7 +1777,7 @@ public void run() {
View view = beginTouchAt.view;
if (view != null) {
performItemClick(view, beginTouchAt.itemSection,
- beginTouchAt.itemIndex, itemAdapter.getItemId(
+ beginTouchAt.itemIndex, mAdapter.getItemId(
beginTouchAt.itemSection,
beginTouchAt.itemIndex));
}
@@ -1574,9 +1854,8 @@ public void removeScrollListener(OnScrollListener listener) {
public void scrollToItem(int sectionIndex, int itemIndex, boolean animate) {
Section section;
- if (sectionIndex > itemAdapter.getNumberOfSections()
- || sectionIndex < 0
- || (section = itemAdapter.getSection(sectionIndex)) == null) {
+ if (sectionIndex > mAdapter.getNumberOfSections() || sectionIndex < 0
+ || (section = mAdapter.getSection(sectionIndex)) == null) {
return;
}
@@ -1584,18 +1863,18 @@ public void scrollToItem(int sectionIndex, int itemIndex, boolean animate) {
return;
}
- FreeFlowItem freeflowItem = layout.getFreeFlowItemForItem(section
+ FreeFlowItem freeflowItem = mLayout.getFreeFlowItemForItem(section
.getDataAtIndex(itemIndex));
freeflowItem = FreeFlowItem.clone(freeflowItem);
int newVPX = freeflowItem.frame.left;
int newVPY = freeflowItem.frame.top;
- if (newVPX > layout.getContentWidth() - getMeasuredWidth())
- newVPX = layout.getContentWidth() - getMeasuredWidth();
+ if (newVPX > mLayout.getContentWidth() - getMeasuredWidth())
+ newVPX = mLayout.getContentWidth() - getMeasuredWidth();
- if (newVPY > layout.getContentHeight() - getMeasuredHeight())
- newVPY = layout.getContentHeight() - getMeasuredHeight();
+ if (newVPY > mLayout.getContentHeight() - getMeasuredHeight())
+ newVPY = mLayout.getContentHeight() - getMeasuredHeight();
if (animate) {
scroller.startScroll(viewPortX, viewPortY, (newVPX - viewPortX),
@@ -1603,7 +1882,6 @@ public void scrollToItem(int sectionIndex, int itemIndex, boolean animate) {
post(flingRunnable);
} else {
moveViewportBy((viewPortX - newVPX), (viewPortY - newVPY), false);
- invokeOnItemScrollListeners();
}
}
@@ -1613,9 +1891,9 @@ public void scrollToItem(int sectionIndex, int itemIndex, boolean animate) {
* @return
*/
public float getScrollPercentX() {
- if (layout == null || itemAdapter == null)
+ if (mLayout == null || mAdapter == null)
return 0;
- float w = layout.getContentWidth();
+ float w = mLayout.getContentWidth();
float scrollableWidth = w - getWidth();
if (scrollableWidth == 0)
return 0;
@@ -1628,9 +1906,9 @@ public float getScrollPercentX() {
* @return
*/
public float getScrollPercentY() {
- if (layout == null || itemAdapter == null)
+ if (mLayout == null || mAdapter == null)
return 0;
- float ht = layout.getContentHeight();
+ float ht = mLayout.getContentHeight();
float scrollableHeight = ht - getHeight();
if (scrollableHeight == 0)
return 0;
@@ -1654,14 +1932,14 @@ public interface OnScrollListener {
public void onScroll(FreeFlowContainer container);
}
-
+
/******** DEBUGGING HELPERS *******/
/**
* A flag for conditionally printing Container lifecycle events to LogCat
* for debugging
*/
- public boolean logDebugEvents = true;
+ public boolean logDebugEvents = false;
/**
* A utility method for debugging lifecycle events and putting them in the
@@ -1670,9 +1948,9 @@ public interface OnScrollListener {
* @param msg
*/
private void logLifecycleEvent(String msg) {
- if(logDebugEvents){
- Log.d("ContainerLifecycleEvent", msg);
- }
+ // if (logDebugEvents && BuildConfig.DEBUG) {
+ // Log.d("ContainerLifecycleEvent", msg);
+ // }
}
}
diff --git a/FreeFlow/src/com/comcast/freeflow/core/FreeFlowEventListener.java b/FreeFlow/src/com/comcast/freeflow/core/FreeFlowEventListener.java
index a8bcb0f..e15c2ea 100644
--- a/FreeFlow/src/com/comcast/freeflow/core/FreeFlowEventListener.java
+++ b/FreeFlow/src/com/comcast/freeflow/core/FreeFlowEventListener.java
@@ -24,7 +24,10 @@
*/
public interface FreeFlowEventListener {
- public void animationsStarted();
+ /**
+ * Event dispatched when layout change animations are about to begin.
+ */
+ public void layoutChangeAnimationsStarting();
public void layoutChangeAnimationsComplete();
diff --git a/FreeFlow/src/com/comcast/freeflow/core/LayoutChangeset.java b/FreeFlow/src/com/comcast/freeflow/core/LayoutChangeset.java
index 9db66a7..c63f040 100644
--- a/FreeFlow/src/com/comcast/freeflow/core/LayoutChangeset.java
+++ b/FreeFlow/src/com/comcast/freeflow/core/LayoutChangeset.java
@@ -16,16 +16,22 @@
package com.comcast.freeflow.core;
import java.util.ArrayList;
+import java.util.List;
import android.graphics.Rect;
import android.util.Pair;
+import com.comcast.freeflow.animations.FreeFlowLayoutAnimator;
+
public class LayoutChangeset {
- protected ArrayList> moved = new ArrayList>();
- protected ArrayList removed = new ArrayList();
- protected ArrayList added = new ArrayList();
+ protected List> moved;
+ protected List removed;
+ protected List added;
public LayoutChangeset() {
+ moved = new ArrayList>();
+ removed = new ArrayList();
+ added = new ArrayList();
}
public void addToMoved(FreeFlowItem proxy, Rect oldFrame) {
@@ -40,27 +46,57 @@ public void addToAdded(FreeFlowItem proxy) {
added.add(proxy);
}
- public ArrayList getAdded() {
+ /**
+ * Returns the list of FreeFlowItems that will be added because they are
+ * present in the new Layout that the FreeFlowContainer is transitioning to.
+ * The views representing these items are already placed on the stage before
+ * the LayoutAnimator is called.
+ *
+ */
+ public List getAdded() {
return added;
}
-
- public ArrayList getRemoved() {
+
+ /**
+ * Returns the list of FreeFlowItems that are not present in the current
+ * viewport of the layout that the FreeFlowContainer is transitioning to,
+ * and needs to be removed.
+ *
+ * The views represnting the FreeFlowItems in this list are still on the
+ * stage when the LayoutAnimator is given control if you want to animate the
+ * removal. You don't have to call removeView on these items, the
+ * FreeFlowContainer will do that when the animator relinquishes control by
+ * calling the
+ * {@link com.comcast.freeflow.core.FreeFlowContainer#onLayoutChangeAnimationsCompleted(FreeFlowLayoutAnimator anim)}
+ *
+ * @return
+ */
+ public List getRemoved() {
return removed;
}
- public ArrayList> getMoved() {
+ /**
+ * Returns all the items that will move when the layouts change (not added
+ * or removed). The returned item is a Pair: the first item representing the
+ * FreeFlowItem that represents the view being moved and the second the Rect
+ * it is moving from.
+ *
+ * To get a reference to the view thats moving, you can call item.view on
+ * the FreeFlowItem. To get a reference to the Rect its moving to, call
+ * item.frame.
+ */
+ public List> getMoved() {
return moved;
}
@Override
public String toString() {
- return "Added: " + added.size() + "," +
- "Removed: " + removed.size()+ ","+
- "Moved: " + moved.size();
+ return "Added: " + added.size() + "," + "Removed: " + removed.size()
+ + "," + "Moved: " + moved.size();
}
public boolean isEmpty() {
- return (added.size() == 0 && removed.size() == 0 && moved.size() == 0);
+ return (added.size() == 0 && removed.size() == 0 && moved.size() == 0);
}
}
diff --git a/FreeFlow/src/com/comcast/freeflow/core/Section.java b/FreeFlow/src/com/comcast/freeflow/core/Section.java
index 456f35b..3caacbc 100644
--- a/FreeFlow/src/com/comcast/freeflow/core/Section.java
+++ b/FreeFlow/src/com/comcast/freeflow/core/Section.java
@@ -16,10 +16,11 @@
package com.comcast.freeflow.core;
import java.util.ArrayList;
+import java.util.List;
public class Section {
- protected ArrayList