Merge pull request markushi#1 from markushi/feature_animation_improvements

Improved animation handling, added BakedBezierInterpolator

Author: markushi

README.md

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.markushi:android-ui:1.0'
+    compile 'com.github.markushi:android-ui:1.1'
 }
 ```
 

example.apk

@@ -1,4 +1,4 @@
-VERSION_NAME=1.0
+VERSION_NAME=1.1
 VERSION_CODE=1
 GROUP=com.github.markushi
 

gradle.properties

@@ -11,6 +11,9 @@
 import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
 
+import at.markushi.ui.util.BakedBezierInterpolator;
+import at.markushi.ui.util.UiHelper;
+
 public class RevealColorView extends ViewGroup {
 
 	public static final int ANIMATION_REVEAL = 0;
@@ -20,7 +23,6 @@ public class RevealColorView extends ViewGroup {
 
 	private View inkView;
 	private int inkColor;
-
 	private ShapeDrawable circle;
 	private ViewPropertyAnimator animator;
 
@@ -83,9 +85,11 @@ public void reveal(final int x, final int y, final int color, final int startRad
 		circle.getPaint().setColor(color);
 		inkView.setVisibility(View.VISIBLE);
 
-		final float startRadiusAsScale = startRadius * 2f / inkView.getHeight();
-		prepareView(inkView, x, y, startRadiusAsScale);
-		animator = inkView.animate().scaleX(SCALE).scaleY(SCALE).setDuration(duration).setListener(new Animator.AnimatorListener() {
+		final float startScale = startRadius * 2f / inkView.getHeight();
+		final float finalScale = calculateScale(x, y) * SCALE;
+
+		prepareView(inkView, x, y, startScale);
+		animator = inkView.animate().scaleX(finalScale).scaleY(finalScale).setDuration(duration).setListener(new Animator.AnimatorListener() {
 			@Override
 			public void onAnimationStart(Animator animator) {
 				if (listener != null) {
@@ -135,10 +139,12 @@ public void hide(final int x, final int y, final int color, final int endRadius,
 		inkView.setVisibility(View.VISIBLE);
 		setBackgroundColor(color);
 
-		prepareView(inkView, x, y, SCALE);
+		final float startScale = calculateScale(x, y) * SCALE;
+		final float finalScale = endRadius * SCALE / inkView.getWidth();
 
-		final float endRadiusAsScale = endRadius * SCALE / inkView.getWidth();
-		animator = inkView.animate().scaleX(endRadiusAsScale).scaleY(endRadiusAsScale).setDuration(duration).setListener(new Animator.AnimatorListener() {
+		prepareView(inkView, x, y, startScale);
+
+		animator = inkView.animate().scaleX(finalScale).scaleY(finalScale).setDuration(duration).setListener(new Animator.AnimatorListener() {
 			@Override
 			public void onAnimationStart(Animator animator) {
 				if (listener != null) {
@@ -176,6 +182,7 @@ public ViewPropertyAnimator prepareAnimator(ViewPropertyAnimator animator, int t
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 			animator.withLayer();
 		}
+		animator.setInterpolator(BakedBezierInterpolator.getInstance());
 		return animator;
 	}
 
@@ -189,4 +196,23 @@ private void prepareView(View view, int x, int y, float scale) {
 		view.setScaleX(scale);
 		view.setScaleY(scale);
 	}
+
+	/**
+	 * calculates the required scale of the ink-view to fill the whole view
+	 *
+	 * @param x circle center x
+	 * @param y circle center y
+	 * @return
+	 */
+	private float calculateScale(int x, int y) {
+		final float centerX = getWidth() / 2f;
+		final float centerY = getHeight() / 2f;
+		final float maxDistance = (float) Math.sqrt(centerX * centerX + centerY * centerY);
+
+		final float deltaX = centerX - x;
+		final float deltaY = centerY - y;
+		final float distance = (float) Math.sqrt(deltaX * deltaX + deltaY * deltaY);
+		final float scale = 0.5f + (distance / maxDistance) * 0.5f;
+		return scale;
+	}
 }

src/main/java/at/markushi/ui/RevealColorView.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * 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 at.markushi.ui.util;
+
+import android.view.animation.Interpolator;
+
+/**
+ * A pre-baked bezier-curved interpolator for indeterminate progress animations.
+ */
+public final class BakedBezierInterpolator implements Interpolator {
+    private static final BakedBezierInterpolator INSTANCE = new BakedBezierInterpolator();
+
+    public final static BakedBezierInterpolator getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Use getInstance instead of instantiating.
+     */
+    private BakedBezierInterpolator() {
+        super();
+    }
+
+    /**
+     * Lookup table values.
+     * Generated using a Bezier curve from (0,0) to (1,1) with control points:
+     * P0 (0,0)
+     * P1 (0.4, 0)
+     * P2 (0.2, 1.0)
+     * P3 (1.0, 1.0)
+     *
+     * Values sampled with x at regular intervals between 0 and 1.
+     */
+    private static final float[] VALUES = new float[] {
+        0.0f, 0.0002f, 0.0009f, 0.0019f, 0.0036f, 0.0059f, 0.0086f, 0.0119f, 0.0157f, 0.0209f,
+        0.0257f, 0.0321f, 0.0392f, 0.0469f, 0.0566f, 0.0656f, 0.0768f, 0.0887f, 0.1033f, 0.1186f,
+        0.1349f, 0.1519f, 0.1696f, 0.1928f, 0.2121f, 0.237f, 0.2627f, 0.2892f, 0.3109f, 0.3386f,
+        0.3667f, 0.3952f, 0.4241f, 0.4474f, 0.4766f, 0.5f, 0.5234f, 0.5468f, 0.5701f, 0.5933f,
+        0.6134f, 0.6333f, 0.6531f, 0.6698f, 0.6891f, 0.7054f, 0.7214f, 0.7346f, 0.7502f, 0.763f,
+        0.7756f, 0.7879f, 0.8f, 0.8107f, 0.8212f, 0.8326f, 0.8415f, 0.8503f, 0.8588f, 0.8672f,
+        0.8754f, 0.8833f, 0.8911f, 0.8977f, 0.9041f, 0.9113f, 0.9165f, 0.9232f, 0.9281f, 0.9328f,
+        0.9382f, 0.9434f, 0.9476f, 0.9518f, 0.9557f, 0.9596f, 0.9632f, 0.9662f, 0.9695f, 0.9722f,
+        0.9753f, 0.9777f, 0.9805f, 0.9826f, 0.9847f, 0.9866f, 0.9884f, 0.9901f, 0.9917f, 0.9931f,
+        0.9944f, 0.9955f, 0.9964f, 0.9973f, 0.9981f, 0.9986f, 0.9992f, 0.9995f, 0.9998f, 1.0f, 1.0f
+    };
+
+    private static final float STEP_SIZE = 1.0f / (VALUES.length - 1);
+
+    @Override
+    public float getInterpolation(float input) {
+        if (input >= 1.0f) {
+            return 1.0f;
+        }
+
+        if (input <= 0f) {
+            return 0f;
+        }
+
+        int position = Math.min(
+                (int)(input * (VALUES.length - 1)),
+                VALUES.length - 2);
+
+        float quantized = position * STEP_SIZE;
+        float difference = input - quantized;
+        float weight = difference / STEP_SIZE;
+
+        return VALUES[position] + weight * (VALUES[position + 1] - VALUES[position]);
+    }
+
+}

src/main/java/at/markushi/ui/util/BakedBezierInterpolator.java

@@ -1,4 +1,4 @@
-package at.markushi.ui;
+package at.markushi.ui.util;
 
 import android.graphics.drawable.Drawable;
 import android.os.Build;

src/main/java/at/markushi/ui/UiHelper.java renamed to src/main/java/at/markushi/ui/util/UiHelper.java

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="rcv_animationDurationHide">420</integer>
+    <integer name="rcv_animationDurationReveal">420</integer>
+</resources>