diff --git a/EaseAnimation/Demo/build.gradle b/EaseAnimation/Demo/build.gradle index fd22e1b..166ff96 100644 --- a/EaseAnimation/Demo/build.gradle +++ b/EaseAnimation/Demo/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "23.0.0 rc2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "cimi.com.easedemo" minSdkVersion 15 - targetSdkVersion 22 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -17,17 +17,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - sourceSets { - main { - jniLibs.srcDirs = ['libs'] - } - } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - // compile fileTree(dir: 'libs', include: ['*.so']) - compile 'com.android.support:appcompat-v7:22.2.0' - compile files('libs/ease-interpolator-1.0.jar') - compile project(':EaseInterpolatorLib') + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation project(':EaseInterpolatorLib') } \ No newline at end of file diff --git a/EaseAnimation/EaseInterpolatorLib/build.gradle b/EaseAnimation/EaseInterpolatorLib/build.gradle index 9402890..0fb6d79 100644 --- a/EaseAnimation/EaseInterpolatorLib/build.gradle +++ b/EaseAnimation/EaseInterpolatorLib/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 22 - buildToolsVersion "23.0.0 rc2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { minSdkVersion 15 - targetSdkVersion 22 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -19,6 +19,5 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.2.0' + testImplementation 'junit:junit:4.12' } diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackInInterpolator.png new file mode 100644 index 0000000..45b9bc0 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackInOutInterpolator.png new file mode 100644 index 0000000..89eae75 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackOutInterpolator.png new file mode 100644 index 0000000..1fce239 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBackOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceInInterpolator.png new file mode 100644 index 0000000..5651ba4 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceInOutInterpolator.png new file mode 100644 index 0000000..f6e4a5b Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceOutInterpolator.png new file mode 100644 index 0000000..fbd2bc5 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBounceOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBreathInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBreathInterpolator.png new file mode 100644 index 0000000..d085327 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseBreathInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularInInterpolator.png new file mode 100644 index 0000000..e55685c Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularInOutInterpolator.png new file mode 100644 index 0000000..28e6879 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularOutInterpolator.png new file mode 100644 index 0000000..d7d268a Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCircularOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicInInterpolator.png new file mode 100644 index 0000000..14eae3b Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicInOutInterpolator.png new file mode 100644 index 0000000..e92fcd4 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicOutInterpolator.png new file mode 100644 index 0000000..73cf348 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseCubicOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticInInterpolator.png new file mode 100644 index 0000000..c827ebe Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticInOutInterpolator.png new file mode 100644 index 0000000..3f60524 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticOutInterpolator.png new file mode 100644 index 0000000..dbb7823 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseElasticOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialInInterpolator.png new file mode 100644 index 0000000..324c7bd Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialInOutInterpolator.png new file mode 100644 index 0000000..0099b6d Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialOutInterpolator.png new file mode 100644 index 0000000..c45f5b3 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseExponentialOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadInInterpolator.png new file mode 100644 index 0000000..e3d06ea Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadInOutInterpolator.png new file mode 100644 index 0000000..8d8e6f4 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadOutInterpolator.png new file mode 100644 index 0000000..5237670 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuadOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartInInterpolator.png new file mode 100644 index 0000000..82e6664 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartInOutInterpolator.png new file mode 100644 index 0000000..8c29b15 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartOutInterpolator.png new file mode 100644 index 0000000..8d2b2e2 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuartOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintInInterpolator.png new file mode 100644 index 0000000..8442beb Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintInOutInterpolator.png new file mode 100644 index 0000000..da64d3e Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintOutInterpolator.png new file mode 100644 index 0000000..03074f9 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseQuintOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineInInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineInInterpolator.png new file mode 100644 index 0000000..4fbec21 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineInInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineInOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineInOutInterpolator.png new file mode 100644 index 0000000..1d082b0 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineInOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineOutInterpolator.png b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineOutInterpolator.png new file mode 100644 index 0000000..486a607 Binary files /dev/null and b/EaseAnimation/EaseInterpolatorLib/docs/images/EaseSineOutInterpolator.png differ diff --git a/EaseAnimation/EaseInterpolatorLib/gradle/wrapper/gradle-wrapper.properties b/EaseAnimation/EaseInterpolatorLib/gradle/wrapper/gradle-wrapper.properties index 85615b8..159be78 100644 --- a/EaseAnimation/EaseInterpolatorLib/gradle/wrapper/gradle-wrapper.properties +++ b/EaseAnimation/EaseInterpolatorLib/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/EaseAnimation/EaseInterpolatorLib/src/androidTest/java/cimi/com/easeinterpolator/ApplicationTest.java b/EaseAnimation/EaseInterpolatorLib/src/androidTest/java/cimi/com/easeinterpolator/ApplicationTest.java deleted file mode 100644 index 746c659..0000000 --- a/EaseAnimation/EaseInterpolatorLib/src/androidTest/java/cimi/com/easeinterpolator/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package cimi.com.easeinterpolator; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/AndroidManifest.xml b/EaseAnimation/EaseInterpolatorLib/src/main/AndroidManifest.xml index 1ce3d61..51fa900 100644 --- a/EaseAnimation/EaseInterpolatorLib/src/main/AndroidManifest.xml +++ b/EaseAnimation/EaseInterpolatorLib/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ - - - + diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInInterpolator.java index daaca0e..223ef8d 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseBackInInterpolator implements Interpolator { - public EaseBackInInterpolator() {} - - public EaseBackInInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return input * input * ((1.70158f + 1) * input - 1.70158f); - } + public float getInterpolation(float input) { + return input * input * ((1.70158f + 1) * input - 1.70158f); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInOutInterpolator.java index f90b973..3ad0f06 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackInOutInterpolator.java @@ -1,27 +1,20 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseBackInOutInterpolator implements Interpolator { - public EaseBackInOutInterpolator() {} - - public EaseBackInOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - float s = 1.70158f; - if((input *= 2) < 1) { - return 0.5f * (input * input * (((s *= (1.525f)) + 1) * input - s)); - } - - return 0.5f * ((input -= 2) * input * (((s *= (1.525f)) + 1) * input + s) + 2); - - } + public float getInterpolation(float input) { + float s = 1.70158f; + if ((input *= 2) < 1) { + return 0.5f * (input * input * (((s *= (1.525f)) + 1) * input - s)); + } + return 0.5f * ((input -= 2) * input * (((s *= (1.525f)) + 1) * input + s) + 2); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackOutInterpolator.java index 7f646a8..5b04569 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBackOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseBackOutInterpolator implements Interpolator { - public EaseBackOutInterpolator() {} - - public EaseBackOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return ((input = input - 1) * input * ((1.70158f + 1) * input + 1.70158f) + 1); - } + public float getInterpolation(float input) { + return ((input = input - 1) * input * ((1.70158f + 1) * input + 1.70158f) + 1); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInInterpolator.java index d43b76e..f7d53b3 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInInterpolator.java @@ -1,28 +1,22 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseBounceInInterpolator implements Interpolator { - - public EaseBounceInInterpolator() {} - - public EaseBounceInInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - input = 1 - input; - if (input < (1 / 2.75)) - return 1 - (7.5625f * input * input); - else if (input < (2 / 2.75)) - return 1 - (7.5625f * (input -= (1.5f / 2.75f)) * input + 0.75f); - else if (input < (2.5 / 2.75)) - return 1 - (7.5625f * (input -= (2.25f / 2.75f)) * input + 0.9375f); - else - return 1 - (7.5625f * (input -= (2.625f / 2.75f)) * input + 0.984375f); - } + public float getInterpolation(float input) { + input = 1 - input; + if (input < (1 / 2.75)) { + return 1 - (7.5625f * input * input); + } else if (input < (2 / 2.75)) { + return 1 - (7.5625f * (input -= (1.5f / 2.75f)) * input + 0.75f); + } else if (input < (2.5 / 2.75)) { + return 1 - (7.5625f * (input -= (2.25f / 2.75f)) * input + 0.9375f); + } else { return 1 - (7.5625f * (input -= (2.625f / 2.75f)) * input + 0.984375f); } + } } \ No newline at end of file diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInOutInterpolator.java index 27ceccb..b2f3183 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceInOutInterpolator.java @@ -1,45 +1,40 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseBounceInOutInterpolator implements Interpolator { - public EaseBounceInOutInterpolator() { - } - - public EaseBounceInOutInterpolator(Context context, AttributeSet attrs) { - } - public float getInterpolation(float input) { if ((input) < 0.5f) { // EaseBounceInInterpolator input = input * 2; input = 1 - input; - if (input < (1 / 2.75)) + if (input < (1 / 2.75)) { return (1 - (7.5625f * input * input)) * 0.5f; - else if (input < (2 / 2.75)) + } else if (input < (2 / 2.75)) { return (1 - (7.5625f * (input -= (1.5f / 2.75f)) * input + 0.75f)) * 0.5f; - else if (input < (2.5 / 2.75)) + } else if (input < (2.5 / 2.75)) { return (1 - (7.5625f * (input -= (2.25f / 2.75f)) * input + 0.9375f)) * 0.5f; - else + } else { return (1 - (7.5625f * (input -= (2.625f / 2.75f)) * input + 0.984375f)) * 0.5f; + } } else { // EaseBounceOutInterpolator input = input * 2 - 1; - if (input < (1 / 2.75)) + if (input < (1 / 2.75)) { return ((7.5625f * input * input)) * 0.5f + 1 * 0.5f; - else if (input < (2 / 2.75)) + } else if (input < (2 / 2.75)) { return ((7.5625f * (input -= (1.5f / 2.75f)) * input + 0.75f)) * 0.5f + 1 * 0.5f; - else if (input < (2.5 / 2.75)) + } else if (input < (2.5 / 2.75)) { return ((7.5625f * (input -= (2.25f / 2.75f)) * input + 0.9375f)) * 0.5f + 1 * 0.5f; - else + } else { return ((7.5625f * (input -= (2.625f / 2.75f)) * input + 0.984375f)) * 0.5f + 1 * 0.5f; + } } } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceOutInterpolator.java index ce87882..544b25e 100644 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBounceOutInterpolator.java @@ -1,27 +1,21 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseBounceOutInterpolator implements Interpolator { - - public EaseBounceOutInterpolator() {} - - public EaseBounceOutInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - if (input < (1 / 2.75)) - return (7.5625f * input * input); - else if (input < (2 / 2.75)) - return (7.5625f * (input -= (1.5f / 2.75f)) * input + 0.75f); - else if (input < (2.5 / 2.75)) - return (7.5625f * (input -= (2.25f / 2.75f)) * input + 0.9375f); - else - return (7.5625f * (input -= (2.625f / 2.75f)) * input + 0.984375f); - } + public float getInterpolation(float input) { + if (input < (1 / 2.75)) { + return (7.5625f * input * input); + } else if (input < (2 / 2.75)) { + return (7.5625f * (input -= (1.5f / 2.75f)) * input + 0.75f); + } else if (input < (2.5 / 2.75)) { + return (7.5625f * (input -= (2.25f / 2.75f)) * input + 0.9375f); + } else { return (7.5625f * (input -= (2.625f / 2.75f)) * input + 0.984375f); } + } } \ No newline at end of file diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBreathInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBreathInterpolator.java index 488ef27..6059e43 100644 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBreathInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseBreathInterpolator.java @@ -1,30 +1,19 @@ package cimi.com.easeinterpolator; -/** - * Created by cimi on 15/8/17. - */ - -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** - * Created by tracytheron on 15/8/1. + * Created by cimi on 15/8/17. + * */ public class EaseBreathInterpolator implements Interpolator { - public EaseBreathInterpolator() {} - - public EaseBreathInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - if(input < 0.333){ + if (input < 0.333) { return (float) (0.5f + 0.5f * Math.sin(input * 3.0f * Math.PI - Math.PI * 0.5f)); - }else{ + } else { return (float) Math.pow((0.5 * Math.sin(-3f * Math.PI * input * 0.5f + Math.PI) + 0.5f), 2); } - } - } \ No newline at end of file diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInInterpolator.java index 1c2d31c..c65a926 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseCircularInInterpolator implements Interpolator { - - public EaseCircularInInterpolator() {} - - public EaseCircularInInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - return (float) (-1 * (Math.sqrt(1 - input * input) - 1.0f)); - } + public float getInterpolation(float input) { + return (float) (-1 * (Math.sqrt(1 - input * input) - 1.0f)); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInOutInterpolator.java index b5faa49..8232630 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularInOutInterpolator.java @@ -1,24 +1,19 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseCircularInOutInterpolator implements Interpolator { - - public EaseCircularInOutInterpolator() {} - - public EaseCircularInOutInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - if((input /= 0.5) < 1) { - return (float) (-1 * 0.5 * (Math.sqrt(1 - input * input) - 1)); - } + public float getInterpolation(float input) { + if ((input /= 0.5) < 1) { + return (float) (-1 * 0.5 * (Math.sqrt(1 - input * input) - 1)); + } - return (float) (0.5 * (Math.sqrt(1 - (input -= 2) * input) + 1)); - } + return (float) (0.5 * (Math.sqrt(1 - (input -= 2) * input) + 1)); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularOutInterpolator.java index aa6015d..ae8ffb2 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCircularOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseCircularOutInterpolator implements Interpolator { - - public EaseCircularOutInterpolator() {} - - public EaseCircularOutInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - return (float) (Math.sqrt(1 - (input - 1) * (input - 1))); - } + public float getInterpolation(float input) { + return (float) (Math.sqrt(1 - (input - 1) * (input - 1))); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInInterpolator.java index ae29733..f4a586f 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseCubicInInterpolator implements Interpolator { - - public EaseCubicInInterpolator() {} - - public EaseCubicInInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - return input * input * input; - } + public float getInterpolation(float input) { + return input * input * input; + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInOutInterpolator.java index 0070f29..c0fccd1 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicInOutInterpolator.java @@ -1,23 +1,18 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseCubicInOutInterpolator implements Interpolator { - - public EaseCubicInOutInterpolator() {} - - public EaseCubicInOutInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - if((input /= 0.5f) < 1) { - return 0.5f * input * input * input; - } - return 0.5f * ((input -= 2) * input * input + 2); - } + public float getInterpolation(float input) { + if ((input /= 0.5f) < 1) { + return 0.5f * input * input * input; + } + return 0.5f * ((input -= 2) * input * input + 2); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicOutInterpolator.java index a8b8b9d..b6f14e4 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseCubicOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/2. + * */ public class EaseCubicOutInterpolator implements Interpolator { - - public EaseCubicOutInterpolator() {} - - public EaseCubicOutInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - return (input - 1) * (input - 1) * (input - 1) + 1; - } + public float getInterpolation(float input) { + return (input - 1) * (input - 1) * (input - 1) + 1; + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInInterpolator.java index 54f31db..58f09f6 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInInterpolator.java @@ -1,52 +1,47 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseElasticInInterpolator implements Interpolator { - private float mDuration; - - /** + private final float mDuration; + + /** + * * @param durationMillis Duration in milliseconds. The duration cannot be negative. - * * @throws IllegalArgumentException if the duration is < 0 - * */ - public EaseElasticInInterpolator(float durationMillis) { - if (durationMillis < 0) { + public EaseElasticInInterpolator(final float durationMillis) { + if (durationMillis < 0) { throw new IllegalArgumentException("Animation duration cannot be negative"); } - mDuration = durationMillis / 1000f; - } - - - public EaseElasticInInterpolator(Context context, AttributeSet attrs) {} + mDuration = durationMillis / 1000f; + } - public float getInterpolation(float input) { - float s; - float p = 0.0f; - float a = 0.0f; - if(input == 0) { - return 0; - } - if(input == 1) { - return 1; - } - if(p == 0) { - p = mDuration * 0.3f; - } - if(a == 0 || (1 > 0 && a < 1) || (1 < 0 /*&& a < -1*/)) { - a = 1; - s = p / 4; - } else { - s = (float) (p / MathConstants._2PI * Math.asin(1 / a)); - } - return (float) (-(a * Math.pow(2, 10 * (input -= 1)) * Math.sin((input * mDuration - s) * MathConstants._2PI / p)) + 0); - } + public float getInterpolation(float input) { + float s; + float p = 0.0f; + float a = 0.0f; + if (input == 0) { + return 0; + } + if (input == 1) { + return 1; + } + if (p == 0) { + p = mDuration * 0.3f; + } + if (a == 0 || (1 > 0 && a < 1) || (1 < 0 /*&& a < -1*/)) { + a = 1; + s = p / 4; + } else { + s = (float) (p / MathConstants._2PI * Math.asin(1 / a)); + } + return (float) (-(a * Math.pow(2, 10 * (input -= 1)) * Math.sin((input * mDuration - s) * MathConstants._2PI / p)) + 0); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInOutInterpolator.java index 81f9729..f5fe1fd 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticInOutInterpolator.java @@ -1,55 +1,50 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseElasticInOutInterpolator implements Interpolator { - - private float mDuration; - - /** + private final float mDuration; + + /** + * * @param durationMillis Duration in milliseconds. The duration cannot be negative. - * * @throws IllegalArgumentException if the duration is < 0 - * */ - public EaseElasticInOutInterpolator(float durationMillis) { - if (durationMillis < 0) { + public EaseElasticInOutInterpolator(final float durationMillis) { + if (durationMillis < 0) { throw new IllegalArgumentException("Animation duration cannot be negative"); } - mDuration = durationMillis / 1000f; - } - - public EaseElasticInOutInterpolator(Context context, AttributeSet attrs) {} + mDuration = durationMillis / 1000f; + } - public float getInterpolation(float input) { - float s; - float p = 0.0f; - float a = 0.0f; - if(input == 0) { - return 0; - } - if((input /= 0.5) == 2) { - return 1; - } - if(p == 0) { - p = mDuration * (0.3f * 1.5f); - } - if(a == 0 || (1 > 0 && a < 1) || (1 < 0 /*&& a < -1*/)) { - a = 1; - s = p / 4; - } else { - s = (float) (p / MathConstants._2PI * Math.asin(1 / a)); - } - if(input < 1) { - return (float) (-0.5 * (a * Math.pow(2, 10 * (input -= 1)) * Math.sin((input * mDuration - s) * MathConstants._2PI / p)) + 0); - } - return (float) (a * Math.pow(2, -10 * (input -= 1)) * Math.sin((input * mDuration - s) * MathConstants._2PI / p) * .5 + 1 + 0); - } + public float getInterpolation(float input) { + float s; + float p = 0.0f; + float a = 0.0f; + if (input == 0) { + return 0; + } + if ((input /= 0.5) == 2) { + return 1; + } + if (p == 0) { + p = mDuration * (0.3f * 1.5f); + } + if (a == 0 || (1 > 0 && a < 1) || (1 < 0 /*&& a < -1*/)) { + a = 1; + s = p / 4; + } else { + s = (float) (p / MathConstants._2PI * Math.asin(1 / a)); + } + if (input < 1) { + return (float) (-0.5 * (a * Math.pow(2, 10 * (input -= 1)) * Math.sin((input * mDuration - s) * MathConstants._2PI / p)) + 0); + } + return (float) (a * Math.pow(2, -10 * (input -= 1)) * Math.sin((input * mDuration - s) * MathConstants._2PI / p) * .5 + 1 + 0); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticOutInterpolator.java index 39a49a6..9dd4a9a 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseElasticOutInterpolator.java @@ -1,53 +1,47 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; - /** * Created by cimi on 15/7/3. + * */ - public class EaseElasticOutInterpolator implements Interpolator { - private float mDuration; - - /** + private final float mDuration; + + /** + * * @param durationMillis Duration in milliseconds. The duration cannot be negative. - * * @throws IllegalArgumentException if the duration is < 0 - * */ - public EaseElasticOutInterpolator(float durationMillis) { - if (durationMillis < 0) { + public EaseElasticOutInterpolator(final float durationMillis) { + if (durationMillis < 0) { throw new IllegalArgumentException("Animation duration cannot be negative"); } - mDuration = durationMillis / 1000f; - } - - public EaseElasticOutInterpolator(Context context, AttributeSet attrs) {} + mDuration = durationMillis / 1000f; + } - public float getInterpolation(float input) { - float s; - float p = 0.0f; - float a = 0.0f; - if(input == 0) { - return 0; - } - if(input == 1) { - return 1; - } - if(p == 0) { - p = mDuration * 0.3f; - } - if(a == 0 || (1 > 0 && a < 1) || (1 < 0 /*&& a < -1*/)) { - a = 1; - s = p / 4; - } else { - s = (float) (p / MathConstants._2PI * Math.asin(1 / a)); - } - return (float) (a * Math.pow(2, -10 * input) * Math.sin((input * mDuration - s) * MathConstants._2PI / p) + 1 + 0); - } + public float getInterpolation(float input) { + float s; + float p = 0.0f; + float a = 0.0f; + if (input == 0) { + return 0; + } + if (input == 1) { + return 1; + } + if (p == 0) { + p = mDuration * 0.3f; + } + if (a == 0 || (1 > 0 && a < 1) || (1 < 0 /*&& a < -1*/)) { + a = 1; + s = p / 4; + } else { + s = (float) (p / MathConstants._2PI * Math.asin(1 / a)); + } + return (float) (a * Math.pow(2, -10 * input) * Math.sin((input * mDuration - s) * MathConstants._2PI / p) + 1 + 0); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInInterpolator.java index 42b89d9..cd6ca2a 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseExponentialInInterpolator implements Interpolator { - - public EaseExponentialInInterpolator() {} - - public EaseExponentialInInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - return (float) ((input == 0) ? 0 : 1 * Math.pow(2, 10 * (input - 1)) - 0.001f); - } + public float getInterpolation(float input) { + return (float) ((input == 0) ? 0 : 1 * Math.pow(2, 10 * (input - 1)) - 0.001f); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInOutInterpolator.java index eec76f1..19ec0af 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialInOutInterpolator.java @@ -1,30 +1,24 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ - public class EaseExponentialInOutInterpolator implements Interpolator { - - public EaseExponentialInOutInterpolator() {} - - public EaseExponentialInOutInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - if(input == 0) { - return 0; - } - if(input == 1) { - return 1; - } - if((input /= 0.5f) < 1) { - return (float) (0.5f * Math.pow(2, 10 * (input - 1))); - } - return (float) (0.5f * (-Math.pow(2, -10 * --input) + 2)); - } + public float getInterpolation(float input) { + if (input == 0) { + return 0; + } + if (input == 1) { + return 1; + } + if ((input /= 0.5f) < 1) { + return (float) (0.5f * Math.pow(2, 10 * (input - 1))); + } + return (float) (0.5f * (-Math.pow(2, -10 * --input) + 2)); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialOutInterpolator.java index 9b01e7d..385611e 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseExponentialOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseExponentialOutInterpolator implements Interpolator { - - public EaseExponentialOutInterpolator() {} - - public EaseExponentialOutInterpolator(Context context, AttributeSet attrs) {} - public float getInterpolation(float input) { - return (float) ((input == 1) ? 1 : (-Math.pow(2, -10 * input) + 1)); - } + public float getInterpolation(float input) { + return (float) ((input == 1) ? 1 : (-Math.pow(2, -10 * input) + 1)); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInInterpolator.java index a1c8aca..bb9e8b2 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuadInInterpolator implements Interpolator { - public EaseQuadInInterpolator() {} - - public EaseQuadInInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return input * input; - } + public float getInterpolation(float input) { + return input * input; + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInOutInterpolator.java index e4b86ae..89fb726 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadInOutInterpolator.java @@ -1,23 +1,18 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuadInOutInterpolator implements Interpolator { - public EaseQuadInOutInterpolator() {} - - public EaseQuadInOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - if((input /= 0.5f) < 1) { - return 0.5f * input * input; - } - return -0.5f * ((--input) * (input - 2) - 1); - } + public float getInterpolation(float input) { + if ((input /= 0.5f) < 1) { + return 0.5f * input * input; + } + return -0.5f * ((--input) * (input - 2) - 1); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadOutInterpolator.java index 888270c..c43653e 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuadOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuadOutInterpolator implements Interpolator { - public EaseQuadOutInterpolator() {} - - public EaseQuadOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return -input * (input - 2); - } + public float getInterpolation(float input) { + return -input * (input - 2); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInInterpolator.java index e6dc993..0503e7b 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuartInInterpolator implements Interpolator { - public EaseQuartInInterpolator() {} - - public EaseQuartInInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return input * input * input * input; - } + public float getInterpolation(float input) { + return input * input * input * input; + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInOutInterpolator.java index 1bdaa50..c667eef 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartInOutInterpolator.java @@ -1,23 +1,18 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuartInOutInterpolator implements Interpolator { - public EaseQuartInOutInterpolator() {} - - public EaseQuartInOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - if((input /= 0.5f) < 1) { - return 0.5f * input * input * input * input; - } - return -0.5f * ((input -= 2) * input * input * input - 2); - } + public float getInterpolation(float input) { + if ((input /= 0.5f) < 1) { + return 0.5f * input * input * input * input; + } + return -0.5f * ((input -= 2) * input * input * input - 2); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartOutInterpolator.java index 78153cd..77e74a8 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuartOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuartOutInterpolator implements Interpolator { - public EaseQuartOutInterpolator() {} - - public EaseQuartOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return 1 - (input - 1) * (input - 1) * (input - 1) * (input - 1); - } + public float getInterpolation(float input) { + return 1 - (input - 1) * (input - 1) * (input - 1) * (input - 1); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInInterpolator.java index 58011b6..615334f 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuintInInterpolator implements Interpolator { - public EaseQuintInInterpolator() {} - - public EaseQuintInInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return input * input * input * input * input; - } + public float getInterpolation(float input) { + return input * input * input * input * input; + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInOutInterpolator.java index b83c39c..57cb038 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintInOutInterpolator.java @@ -1,23 +1,18 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuintInOutInterpolator implements Interpolator { - public EaseQuintInOutInterpolator() {} - - public EaseQuintInOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - if((input /= 0.5f) < 1) { - return 0.5f * input * input * input * input * input; - } - return 0.5f * ((input -= 2) * input * input * input * input + 2); - } + public float getInterpolation(float input) { + if ((input /= 0.5f) < 1) { + return 0.5f * input * input * input * input * input; + } + return 0.5f * ((input -= 2) * input * input * input * input + 2); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintOutInterpolator.java index 508028c..6bdf05d 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseQuintOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseQuintOutInterpolator implements Interpolator { - public EaseQuintOutInterpolator() {} - - public EaseQuintOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return (input - 1) * (input - 1) * (input - 1) * (input - 1) * (input - 1) + 1; - } + public float getInterpolation(float input) { + return (input - 1) * (input - 1) * (input - 1) * (input - 1) * (input - 1) + 1; + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInInterpolator.java index a3c93c7..9792559 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseSineInInterpolator implements Interpolator { - public EaseSineInInterpolator() {} - - public EaseSineInInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return (float) (-1 * Math.cos(input * MathConstants._HALF_PI) + 1); - } + public float getInterpolation(float input) { + return (float) (-1 * Math.cos(input * MathConstants._HALF_PI) + 1); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInOutInterpolator.java index fde8e4c..a9b17dc 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineInOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseSineInOutInterpolator implements Interpolator { - public EaseSineInOutInterpolator() {} - - public EaseSineInOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return (float) (-1 * 0.5f * (Math.cos(MathConstants.PI * input) - 1)); - } + public float getInterpolation(float input) { + return (float) (-1 * 0.5f * (Math.cos(MathConstants.PI * input) - 1)); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineOutInterpolator.java b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineOutInterpolator.java index 6e10c24..f822cc8 100755 --- a/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineOutInterpolator.java +++ b/EaseAnimation/EaseInterpolatorLib/src/main/java/cimi/com/easeinterpolator/EaseSineOutInterpolator.java @@ -1,20 +1,15 @@ package cimi.com.easeinterpolator; -import android.content.Context; -import android.util.AttributeSet; import android.view.animation.Interpolator; /** * Created by cimi on 15/7/3. + * */ public class EaseSineOutInterpolator implements Interpolator { - public EaseSineOutInterpolator() {} - - public EaseSineOutInterpolator(Context context, AttributeSet attrs) {} - - public float getInterpolation(float input) { - return (float) Math.sin(input * MathConstants._HALF_PI); - } + public float getInterpolation(float input) { + return (float) Math.sin(input * MathConstants._HALF_PI); + } } diff --git a/EaseAnimation/EaseInterpolatorLib/src/test/java/cimi/com/easeinterpolator/InterpolatorGraphingTest.java b/EaseAnimation/EaseInterpolatorLib/src/test/java/cimi/com/easeinterpolator/InterpolatorGraphingTest.java new file mode 100644 index 0000000..bc1367f --- /dev/null +++ b/EaseAnimation/EaseInterpolatorLib/src/test/java/cimi/com/easeinterpolator/InterpolatorGraphingTest.java @@ -0,0 +1,237 @@ +package cimi.com.easeinterpolator; + +import android.view.animation.Interpolator; +import org.junit.Before; +import org.junit.Test; + +public class InterpolatorGraphingTest { + + @Before + public void setUp() { + System.out.println("\n"); + } + + @Test + public void testEaseBackInInterpolator() { + final EaseBackInInterpolator interpolator = new EaseBackInInterpolator(); + System.out.println("EaseBackInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseBackInOutInterpolator() { + final EaseBackInOutInterpolator interpolator = new EaseBackInOutInterpolator(); + System.out.println("EaseBackInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseBackOutInterpolator() { + final EaseBackOutInterpolator interpolator = new EaseBackOutInterpolator(); + System.out.println("EaseBackOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseBounceInInterpolator() { + final EaseBounceInInterpolator interpolator = new EaseBounceInInterpolator(); + System.out.println("EaseBounceInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseBounceInOutInterpolator() { + final EaseBounceInOutInterpolator interpolator = new EaseBounceInOutInterpolator(); + System.out.println("EaseBounceInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseBounceOutInterpolator() { + final EaseBounceOutInterpolator interpolator = new EaseBounceOutInterpolator(); + System.out.println("EaseBounceOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseBreathInterpolator() { + final EaseBreathInterpolator interpolator = new EaseBreathInterpolator(); + System.out.println("EaseBreathInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseCircularInInterpolator() { + final EaseCircularInInterpolator interpolator = new EaseCircularInInterpolator(); + System.out.println("EaseCircularInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseCircularInOutInterpolator() { + final EaseCircularInOutInterpolator interpolator = new EaseCircularInOutInterpolator(); + System.out.println("EaseCircularInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseCircularOutInterpolator() { + final EaseCircularOutInterpolator interpolator = new EaseCircularOutInterpolator(); + System.out.println("EaseCircularOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseCubicInInterpolator() { + final EaseCubicInInterpolator interpolator = new EaseCubicInInterpolator(); + System.out.println("EaseCubicInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseCubicInOutInterpolator() { + final EaseCubicInOutInterpolator interpolator = new EaseCubicInOutInterpolator(); + System.out.println("EaseCubicInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseCubicOutInterpolator() { + final EaseCubicOutInterpolator interpolator = new EaseCubicOutInterpolator(); + System.out.println("EaseCubicOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseElasticInInterpolator() { + final EaseElasticInInterpolator interpolator = new EaseElasticInInterpolator(1000f); + System.out.println("EaseElasticInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseElasticInOutInterpolator() { + final EaseElasticInOutInterpolator interpolator = new EaseElasticInOutInterpolator(1000f); + System.out.println("EaseElasticInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseElasticOutInterpolator() { + final EaseElasticOutInterpolator interpolator = new EaseElasticOutInterpolator(1000f); + System.out.println("EaseElasticOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseExponentialInInterpolator() { + final EaseExponentialInInterpolator interpolator = new EaseExponentialInInterpolator(); + System.out.println("EaseExponentialInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseExponentialInOutInterpolator() { + final EaseExponentialInOutInterpolator interpolator = new EaseExponentialInOutInterpolator(); + System.out.println("EaseExponentialInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseExponentialOutInterpolator() { + final EaseExponentialOutInterpolator interpolator = new EaseExponentialOutInterpolator(); + System.out.println("EaseExponentialOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuadInInterpolator() { + final EaseQuadInInterpolator interpolator = new EaseQuadInInterpolator(); + System.out.println("EaseQuadInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuadInOutInterpolator() { + final EaseQuadInOutInterpolator interpolator = new EaseQuadInOutInterpolator(); + System.out.println("EaseQuadInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuadOutInterpolator() { + final EaseQuadOutInterpolator interpolator = new EaseQuadOutInterpolator(); + System.out.println("EaseQuadOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuartInInterpolator() { + final EaseQuartInInterpolator interpolator = new EaseQuartInInterpolator(); + System.out.println("EaseQuartInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuartInOutInterpolator() { + final EaseQuartInOutInterpolator interpolator = new EaseQuartInOutInterpolator(); + System.out.println("EaseQuartInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuartOutInterpolator() { + final EaseQuartOutInterpolator interpolator = new EaseQuartOutInterpolator(); + System.out.println("EaseQuartOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuintInInterpolator() { + final EaseQuintInInterpolator interpolator = new EaseQuintInInterpolator(); + System.out.println("EaseQuintInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuintInOutInterpolator() { + final EaseQuintInOutInterpolator interpolator = new EaseQuintInOutInterpolator(); + System.out.println("EaseQuintInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseQuintOutInterpolator() { + final EaseQuintOutInterpolator interpolator = new EaseQuintOutInterpolator(); + System.out.println("EaseQuintOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseSineInInterpolator() { + final EaseSineInInterpolator interpolator = new EaseSineInInterpolator(); + System.out.println("EaseSineInInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseSineInOutInterpolator() { + final EaseSineInOutInterpolator interpolator = new EaseSineInOutInterpolator(); + System.out.println("EaseSineInOutInterpolator"); + runInterpolator(interpolator); + } + + @Test + public void testEaseSineOutInterpolator() { + final EaseSineOutInterpolator interpolator = new EaseSineOutInterpolator(); + System.out.println("EaseSineOutInterpolator"); + runInterpolator(interpolator); + } + + private void runInterpolator(final Interpolator interpolator) { + System.out.println("t\tx"); + for (float t = 0.0f; t <= 1.01f; t += 0.02f) { + System.out.println(t + "\t" + interpolator.getInterpolation(t)); + } + } +} \ No newline at end of file diff --git a/EaseAnimation/build.gradle b/EaseAnimation/build.gradle index 9405f3f..c74f054 100644 --- a/EaseAnimation/build.gradle +++ b/EaseAnimation/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:3.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/EaseAnimation/gradle/wrapper/gradle-wrapper.properties b/EaseAnimation/gradle/wrapper/gradle-wrapper.properties index 204f6de..8bc1554 100644 --- a/EaseAnimation/gradle/wrapper/gradle-wrapper.properties +++ b/EaseAnimation/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip