Skip to content
This repository was archived by the owner on Feb 8, 2022. It is now read-only.

Commit 19a4aa4

Browse files
author
florent champigny
committed
version 1.0.3
removed nineold api 11+
1 parent 83d8a9d commit 19a4aa4

File tree

8 files changed

+58
-44
lines changed

8 files changed

+58
-44
lines changed

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ViewAnimator
22
=======
33

4-
[![API](https://img.shields.io/badge/API-9%2B-green.svg)](https://github.com/florent37/ViewAnimator/tree/master)
4+
[![API](https://img.shields.io/badge/API-11%2B-green.svg)](https://github.com/florent37/ViewAnimator/tree/master)
55
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-ViewAnimator-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/2942)
66

77
A fluent Android animation library !
@@ -185,8 +185,7 @@ Add into your **build.gradle**
185185
[![Download](https://api.bintray.com/packages/florent37/maven/ViewAnimator/images/download.svg)](https://bintray.com/florent37/maven/ViewAnimator/_latestVersion)
186186

187187
```groovy
188-
compile 'com.github.florent37:viewanimator:1.0.3@aar'
189-
compile 'com.nineoldandroids:library:2.4.0'
188+
compile 'com.github.florent37:viewanimator:1.0.4'
190189
```
191190

192191
#Community

‎build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ buildscript {
99
}
1010
dependencies {
1111
classpath 'com.android.tools.build:gradle:2.1.0'
12-
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1312
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
14-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
13+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
1514
// NOTE: Do not place your application dependencies here; they belong
1615
// in the individual module build.gradle files
1716
}
@@ -21,11 +20,11 @@ ext{
2120
COMPILE_SDK=23
2221
TARGET_SDK=23
2322
BUILD_TOOL="23.0.2"
24-
minSdkVersion = 9
23+
minSdkVersion = 11
2524
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
2625
targetCompatibilityVersion = JavaVersion.VERSION_1_7
2726

28-
libraryVersion="1.0.3"
27+
libraryVersion="1.0.4"
2928
}
3029

3130
allprojects {

‎gradle/bintray-android-v1.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ task sourcesJar(type: Jar) {
88
}
99

1010
task javadoc(type: Javadoc) {
11-
source = android.sourceSets.main.java.srcDirs
11+
//source = android.sourceSets.main.java.srcDirs
1212
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
1313
}
1414

‎sample/sample.iml‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,28 +72,50 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.3.0/jars" />
8892
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
90101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
91103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
92104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
93105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
94107
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
95108
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
96109
</content>
97110
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
98111
<orderEntry type="sourceFolder" forTests="false" />
99-
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
100-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
101112
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
113+
<orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
102114
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
103-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
104-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
115+
<orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
116+
<orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
117+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
118+
<orderEntry type="library" exported="" name="appcompat-v7-23.3.0" level="project" />
105119
<orderEntry type="module" module-name="viewanimator" exported="" />
106120
</component>
107121
</module>

‎viewanimator/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ android {
1414
}
1515
}
1616

17-
version = "1.0.1"
18-
1917
dependencies {
2018
compile fileTree(include: ['*.jar'], dir: 'libs')
21-
compile 'com.android.support:support-annotations:23.1.1'
22-
compile 'com.nineoldandroids:library:2.4.0'
19+
compile 'com.android.support:support-v4:23.3.0'
20+
compile 'com.android.support:appcompat-v7:23.3.0'
21+
compile 'com.android.support:support-annotations:23.3.0'
2322
}
2423

2524
ext {

‎viewanimator/src/main/java/com/github/florent37/viewanimator/AnimationBuilder.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.florent37.viewanimator;
22

3+
import android.animation.Animator;
4+
import android.animation.ArgbEvaluator;
5+
import android.animation.ObjectAnimator;
6+
import android.animation.ValueAnimator;
37
import android.graphics.Path;
48
import android.graphics.PathMeasure;
59
import android.support.annotation.IntRange;
10+
import android.support.v4.view.ViewCompat;
611
import android.util.Log;
712
import android.view.View;
813
import android.view.animation.AccelerateInterpolator;
@@ -11,12 +16,6 @@
1116
import android.view.animation.Interpolator;
1217
import android.widget.TextView;
1318

14-
import com.nineoldandroids.animation.Animator;
15-
import com.nineoldandroids.animation.ArgbEvaluator;
16-
import com.nineoldandroids.animation.ObjectAnimator;
17-
import com.nineoldandroids.animation.ValueAnimator;
18-
import com.nineoldandroids.view.ViewHelper;
19-
2019
import java.util.ArrayList;
2120
import java.util.List;
2221

@@ -27,7 +26,7 @@
2726
public class AnimationBuilder {
2827
private final ViewAnimator viewAnimator;
2928
private final View[] views;
30-
private final List<Animator> animatorList = new ArrayList<Animator>();
29+
private final List<Animator> animatorList = new ArrayList<>();
3130
private boolean waitForHeight;
3231
private boolean nextValueWillBeDp = false;
3332
private Interpolator singleInterpolator = null;
@@ -185,7 +184,7 @@ public AnimationBuilder scale(float... scale) {
185184
*/
186185
public AnimationBuilder pivotX(float pivotX) {
187186
for (View view : views) {
188-
ViewHelper.setPivotX(view, pivotX);
187+
ViewCompat.setPivotX(view, pivotX);
189188
}
190189
return this;
191190
}
@@ -198,7 +197,7 @@ public AnimationBuilder pivotX(float pivotX) {
198197
*/
199198
public AnimationBuilder pivotY(float pivotY) {
200199
for (View view : views) {
201-
ViewHelper.setPivotY(view, pivotY);
200+
ViewCompat.setPivotY(view, pivotY);
202201
}
203202
return this;
204203
}
@@ -711,8 +710,8 @@ public void update(View view, float value) {
711710
pathMeasure.getPosTan(value, currentPosition, null);
712711
final float x = currentPosition[0];
713712
final float y = currentPosition[1];
714-
ViewHelper.setX(view,x);
715-
ViewHelper.setY(view,y);
713+
ViewCompat.setX(view, x);
714+
ViewCompat.setY(view, y);
716715
Log.d(null, "path: value=" + value + ", x=" + x + ", y=" + y);
717716
}
718717
}, 0, pathMeasure.getLength());

‎viewanimator/src/main/java/com/github/florent37/viewanimator/ViewAnimator.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.github.florent37.viewanimator;
22

3+
import android.animation.Animator;
4+
import android.animation.AnimatorSet;
5+
import android.animation.ValueAnimator;
36
import android.support.annotation.IntDef;
47
import android.support.annotation.IntRange;
58
import android.view.View;
69
import android.view.ViewTreeObserver;
710
import android.view.animation.Interpolator;
811

9-
import com.nineoldandroids.animation.Animator;
10-
import com.nineoldandroids.animation.AnimatorSet;
11-
import com.nineoldandroids.animation.ValueAnimator;
12-
1312
import java.lang.annotation.Retention;
1413
import java.lang.annotation.RetentionPolicy;
1514
import java.util.ArrayList;

‎viewanimator/viewanimator.iml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":viewanimator" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.florent37" external.system.module.version="1.0.3" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":viewanimator" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.florent37" external.system.module.version="1.0.4" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -96,12 +96,17 @@
9696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9898
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
100102
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
101103
</content>
102104
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
103105
<orderEntry type="sourceFolder" forTests="false" />
104-
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
105-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
106+
<orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
107+
<orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
108+
<orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
109+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
110+
<orderEntry type="library" exported="" name="appcompat-v7-23.3.0" level="project" />
106111
</component>
107112
</module>

0 commit comments

Comments
 (0)