Merge branch 'feature/interpolator_support' into develop

Author: Cliffus

app/src/main/java/at/blogc/android/activities/MainActivity.java

@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.animation.OvershootInterpolator;
 import android.widget.Button;
 
 import at.blogc.android.views.ExpandableTextView;
@@ -40,6 +41,13 @@ protected void onCreate(Bundle savedInstanceState)
         // set animation duration via code, but preferable in your layout files by using the animation_duration attribute
         expandableTextView.setAnimationDuration(750L);
 
+        // set interpolators for both expanding and collapsing animations
+        expandableTextView.setInterpolator(new OvershootInterpolator());
+
+        // or set them separately
+        expandableTextView.setExpandInterpolator(new OvershootInterpolator());
+        expandableTextView.setCollapseInterpolator(new OvershootInterpolator());
+
         // toggle the ExpandableTextView
         buttonToggle.setOnClickListener(new View.OnClickListener()
         {

expandabletextview/build.gradle

@@ -16,6 +16,8 @@ android {
         targetSdkVersion 23
         versionCode 1
         versionName fullVersion
+
+        buildConfigField 'int', 'DEFAULT_ANIMATION_DURATION', '750'
     }
     buildTypes {
         release {

expandabletextview/src/main/java/at/blogc/android/views/ExpandableTextView.java

@@ -2,16 +2,19 @@
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.TextView;
 
 import java.lang.reflect.Field;
 
+import at.blogc.expandabletextview.BuildConfig;
 import at.blogc.expandabletextview.R;
 
 /**
@@ -28,18 +31,22 @@
  * 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.
+ *
+ * @author Cliff Ophalvens (Blogc.at)
  */
 public class ExpandableTextView extends TextView
 {
-    private static final int DEFAULT_DURATION = 750;
+    // copy off TextView.LINES
     private static final int MAXMODE_LINES = 1;
 
     private OnExpandListener onExpandListener;
+    private TimeInterpolator expandInterpolator;
+    private TimeInterpolator collapseInterpolator;
 
+    private final int maxLines;
     private long animationDuration;
     private boolean animating;
     private boolean expanded;
-    private int maxLines;
     private int originalHeight;
 
     public ExpandableTextView(Context context)
@@ -58,11 +65,15 @@ public ExpandableTextView(Context context, AttributeSet attrs, int defStyle)
 
         // read attributes
         final TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.ExpandableTextView, defStyle, 0);
-        this.animationDuration = attributes.getInt(R.styleable.ExpandableTextView_animation_duration, DEFAULT_DURATION);
+        this.animationDuration = attributes.getInt(R.styleable.ExpandableTextView_animation_duration, BuildConfig.DEFAULT_ANIMATION_DURATION);
         attributes.recycle();
 
         // keep the original value of maxLines
         this.maxLines = this.getMaxLines();
+
+        // create default interpolators
+        this.expandInterpolator = new AccelerateDecelerateInterpolator();
+        this.collapseInterpolator = new AccelerateDecelerateInterpolator();
     }
 
     @Override
@@ -163,6 +174,9 @@ public void onAnimationEnd(final Animator animation)
                 }
             });
 
+            // set interpolator
+            valueAnimator.setInterpolator(this.expandInterpolator);
+
             // start the animation
             valueAnimator
                 .setDuration(this.animationDuration)
@@ -217,6 +231,9 @@ public void onAnimationEnd(final Animator animation)
                 }
             });
 
+            // set interpolator
+            valueAnimator.setInterpolator(this.collapseInterpolator);
+
             // start the animation
             valueAnimator
                 .setDuration(this.animationDuration)
@@ -255,6 +272,52 @@ public OnExpandListener getOnExpandListener()
         return onExpandListener;
     }
 
+    /**
+     * Sets a {@link TimeInterpolator} for expanding and collapsing.
+     * @param interpolator the interpolator
+     */
+    public void setInterpolator(final TimeInterpolator interpolator)
+    {
+        this.expandInterpolator = interpolator;
+        this.collapseInterpolator = interpolator;
+    }
+
+    /**
+     * Sets a {@link TimeInterpolator} for expanding.
+     * @param expandInterpolator the interpolator
+     */
+    public void setExpandInterpolator(final TimeInterpolator expandInterpolator)
+    {
+        this.expandInterpolator = expandInterpolator;
+    }
+
+    /**
+     * Returns the current {@link TimeInterpolator} for expanding.
+     * @return the current interpolator, null by default.
+     */
+    public TimeInterpolator getExpandInterpolator()
+    {
+        return this.expandInterpolator;
+    }
+
+    /**
+     * Sets a {@link TimeInterpolator} for collpasing.
+     * @param collapseInterpolator the interpolator
+     */
+    public void setCollapseInterpolator(final TimeInterpolator collapseInterpolator)
+    {
+        this.collapseInterpolator = collapseInterpolator;
+    }
+
+    /**
+     * Returns the current {@link TimeInterpolator} for collapsing.
+     * @return the current interpolator, null by default.
+     */
+    public TimeInterpolator getCollapseInterpolator()
+    {
+        return this.collapseInterpolator;
+    }
+
     /**
      * Is this {@link ExpandableTextView} expanded or not?
      * @return true if expanded, false if collapsed.