Skip to content

Commit fa310a7

Browse files
HarlonWangHarlonWang
committed
fix with init
1 parent a8a0f9a commit fa310a7

31 files changed

+258
-87
lines changed

‎app/src/main/java/com/wang/avi/sample/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ public class MainActivity extends AppCompatActivity {
1111
@Override
1212
protected void onCreate(Bundle savedInstanceState) {
1313
super.onCreate(savedInstanceState);
14-
setContentView(R.layout.activity_loading);
14+
setContentView(R.layout.test);
1515
}
1616

1717

18-
/* public void visible(View view) {
18+
public void visible(View view) {
1919
findViewById(R.id.testView).setVisibility(View.VISIBLE);
2020
}
2121

@@ -25,5 +25,5 @@ public void gone(View view) {
2525

2626
public void invisible(View view) {
2727
findViewById(R.id.testView).setVisibility(View.INVISIBLE);
28-
}*/
28+
}
2929
}

‎app/src/main/res/layout/test.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<com.wang.avi.AVLoadingIndicatorView
1010
android:layout_width="wrap_content"
1111
android:layout_height="wrap_content"
12-
app:indicator="BallPulse"
12+
app:indicator="BallGridBeat"
1313
android:id="@+id/testView"
1414
/>
1515

‎library/src/main/java/com/wang/avi/AVLoadingIndicatorView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ void drawIndicator(Canvas canvas){
339339
}
340340

341341
void applyAnimation(){
342-
mIndicatorController.createAnimation();
342+
mIndicatorController.initAnimation();
343343
}
344344

345345
private int dp2px(int dpValue) {

‎library/src/main/java/com/wang/avi/indicator/BallBeatIndicator.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
import android.graphics.Canvas;
44
import android.graphics.Paint;
55

6+
import com.nineoldandroids.animation.Animator;
67
import com.nineoldandroids.animation.ValueAnimator;
78

9+
import java.util.ArrayList;
10+
import java.util.List;
11+
812
/**
913
* Created by Jack on 2015/10/19.
1014
*/
@@ -40,7 +44,8 @@ public void draw(Canvas canvas, Paint paint) {
4044
}
4145

4246
@Override
43-
public void createAnimation() {
47+
public List<Animator> createAnimation() {
48+
List<Animator> animators=new ArrayList<>();
4449
int[] delays=new int[]{350,0,350};
4550
for (int i = 0; i < 3; i++) {
4651
final int index=i;
@@ -52,7 +57,6 @@ public void createAnimation() {
5257
@Override
5358
public void onAnimationUpdate(ValueAnimator animation) {
5459
scaleFloats[index] = (float) animation.getAnimatedValue();
55-
System.out.println("scaleFloats="+scaleFloats[index]);
5660
postInvalidate();
5761
}
5862
});
@@ -70,8 +74,10 @@ public void onAnimationUpdate(ValueAnimator animation) {
7074
}
7175
});
7276
alphaAnim.start();
73-
addAnimation(scaleAnim, alphaAnim);
77+
animators.add(scaleAnim);
78+
animators.add(alphaAnim);
7479
}
80+
return animators;
7581
}
7682

7783
}

‎library/src/main/java/com/wang/avi/indicator/BallClipRotateIndicator.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
import android.graphics.Paint;
55
import android.graphics.RectF;
66

7+
import com.nineoldandroids.animation.Animator;
78
import com.nineoldandroids.animation.ValueAnimator;
89

10+
import java.util.ArrayList;
11+
import java.util.List;
12+
913
/**
1014
* Created by Jack on 2015/10/16.
1115
*/
@@ -29,7 +33,8 @@ public void draw(Canvas canvas, Paint paint) {
2933
}
3034

3135
@Override
32-
public void createAnimation() {
36+
public List<Animator> createAnimation() {
37+
List<Animator> animators=new ArrayList<>();
3338
ValueAnimator scaleAnim=ValueAnimator.ofFloat(1,0.6f,0.5f,1);
3439
scaleAnim.setDuration(750);
3540
scaleAnim.setRepeatCount(-1);
@@ -53,7 +58,9 @@ public void onAnimationUpdate(ValueAnimator animation) {
5358
}
5459
});
5560
rotateAnim.start();
56-
addAnimation(scaleAnim,rotateAnim);
61+
animators.add(scaleAnim);
62+
animators.add(rotateAnim);
63+
return animators;
5764
}
5865

5966
}

‎library/src/main/java/com/wang/avi/indicator/BallClipRotateMultipleIndicator.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
import android.graphics.Paint;
55
import android.graphics.RectF;
66

7+
import com.nineoldandroids.animation.Animator;
78
import com.nineoldandroids.animation.ValueAnimator;
89

10+
import java.util.ArrayList;
11+
import java.util.List;
12+
913
/**
1014
* Created by Jack on 2015/10/17.
1115
*/
@@ -49,7 +53,8 @@ public void draw(Canvas canvas, Paint paint) {
4953
}
5054

5155
@Override
52-
public void createAnimation() {
56+
public List<Animator> createAnimation() {
57+
List<Animator> animators=new ArrayList<>();
5358
ValueAnimator scaleAnim=ValueAnimator.ofFloat(1,0.6f,1);
5459
scaleAnim.setDuration(1000);
5560
scaleAnim.setRepeatCount(-1);
@@ -73,7 +78,9 @@ public void onAnimationUpdate(ValueAnimator animation) {
7378
}
7479
});
7580
rotateAnim.start();
76-
addAnimation(scaleAnim,rotateAnim);
81+
animators.add(scaleAnim);
82+
animators.add(rotateAnim);
83+
return animators;
7784
}
7885

7986
}

‎library/src/main/java/com/wang/avi/indicator/BallClipRotatePulseIndicator.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
import android.graphics.Paint;
55
import android.graphics.RectF;
66

7+
import com.nineoldandroids.animation.Animator;
78
import com.nineoldandroids.animation.ValueAnimator;
89

10+
import java.util.ArrayList;
11+
import java.util.List;
12+
913
/**
1014
* Created by Jack on 2015/10/16.
1115
*/
@@ -45,7 +49,7 @@ public void draw(Canvas canvas, Paint paint) {
4549
}
4650

4751
@Override
48-
public void createAnimation() {
52+
public List<Animator> createAnimation() {
4953
ValueAnimator scaleAnim=ValueAnimator.ofFloat(1,0.3f,1);
5054
scaleAnim.setDuration(1000);
5155
scaleAnim.setRepeatCount(-1);
@@ -81,7 +85,11 @@ public void onAnimationUpdate(ValueAnimator animation) {
8185
}
8286
});
8387
rotateAnim.start();
84-
addAnimation(scaleAnim,scaleAnim2,rotateAnim);
88+
List<Animator> animators=new ArrayList<>();
89+
animators.add(scaleAnim);
90+
animators.add(scaleAnim2);
91+
animators.add(rotateAnim);
92+
return animators;
8593
}
8694

8795
}

‎library/src/main/java/com/wang/avi/indicator/BallGridBeatIndicator.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
import android.graphics.Canvas;
44
import android.graphics.Paint;
55

6+
import com.nineoldandroids.animation.Animator;
67
import com.nineoldandroids.animation.ValueAnimator;
78

9+
import java.util.ArrayList;
10+
import java.util.List;
11+
812
/**
913
* Created by Jack on 2015/10/20.
1014
*/
@@ -43,7 +47,9 @@ public void draw(Canvas canvas, Paint paint) {
4347
}
4448

4549
@Override
46-
public void createAnimation() {
50+
public List<Animator> createAnimation() {
51+
List<Animator> animators=new ArrayList<>();
52+
4753
int[] durations={960, 930, 1190, 1130, 1340, 940, 1200, 820, 1190};
4854
int[] delays= {360, 400, 680, 410, 710, -150, -120, 10, 320};
4955

@@ -61,8 +67,9 @@ public void onAnimationUpdate(ValueAnimator animation) {
6167
}
6268
});
6369
alphaAnim.start();
64-
addAnimation(alphaAnim);
70+
animators.add(alphaAnim);
6571
}
72+
return animators;
6673
}
6774

6875

‎library/src/main/java/com/wang/avi/indicator/BallGridPulseIndicator.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
import android.graphics.Canvas;
44
import android.graphics.Paint;
55

6+
import com.nineoldandroids.animation.Animator;
67
import com.nineoldandroids.animation.ValueAnimator;
78

9+
import java.util.ArrayList;
10+
import java.util.List;
11+
812
/**
913
* Created by Jack on 2015/10/16.
1014
*/
@@ -58,7 +62,8 @@ public void draw(Canvas canvas, Paint paint) {
5862
}
5963

6064
@Override
61-
public void createAnimation() {
65+
public List<Animator> createAnimation() {
66+
List<Animator> animators=new ArrayList<>();
6267
int[] durations={720, 1020, 1280, 1420, 1450, 1180, 870, 1450, 1060};
6368
int[] delays= {-60, 250, -170, 480, 310, 30, 460, 780, 450};
6469

@@ -89,8 +94,10 @@ public void onAnimationUpdate(ValueAnimator animation) {
8994
}
9095
});
9196
alphaAnim.start();
92-
addAnimation(scaleAnim,alphaAnim);
97+
animators.add(scaleAnim);
98+
animators.add(alphaAnim);
9399
}
100+
return animators;
94101
}
95102

96103

‎library/src/main/java/com/wang/avi/indicator/BallPulseIndicator.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
import android.graphics.Canvas;
44
import android.graphics.Paint;
55

6+
import com.nineoldandroids.animation.Animator;
67
import com.nineoldandroids.animation.ValueAnimator;
78

9+
import java.util.ArrayList;
10+
import java.util.List;
11+
812
/**
913
* Created by Jack on 2015/10/16.
1014
*/
@@ -36,7 +40,8 @@ public void draw(Canvas canvas, Paint paint) {
3640
}
3741

3842
@Override
39-
public void createAnimation() {
43+
public List<Animator> createAnimation() {
44+
List<Animator> animators=new ArrayList<>();
4045
int[] delays=new int[]{120,240,360};
4146
for (int i = 0; i < 3; i++) {
4247
final int index=i;
@@ -51,14 +56,14 @@ public void createAnimation() {
5156
@Override
5257
public void onAnimationUpdate(ValueAnimator animation) {
5358
scaleFloats[index] = (float) animation.getAnimatedValue();
54-
System.out.println("scaleFloats="+scaleFloats[index]);
5559
postInvalidate();
5660

5761
}
5862
});
5963
scaleAnim.start();
60-
addAnimation(scaleAnim);
64+
animators.add(scaleAnim);
6165
}
66+
return animators;
6267
}
6368

6469
}

‎library/src/main/java/com/wang/avi/indicator/BallPulseRiseIndicator.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44
import android.graphics.Paint;
55
import android.view.animation.LinearInterpolator;
66

7+
import com.nineoldandroids.animation.Animator;
78
import com.nineoldandroids.animation.ObjectAnimator;
89
import com.nineoldandroids.animation.PropertyValuesHolder;
910

11+
import java.util.ArrayList;
12+
import java.util.List;
13+
1014
/**
1115
* Created by Jack on 2015/10/17.
1216
*/
@@ -24,13 +28,15 @@ public void draw(Canvas canvas, Paint paint) {
2428
}
2529

2630
@Override
27-
public void createAnimation() {
31+
public List<Animator> createAnimation() {
2832
PropertyValuesHolder rotation6=PropertyValuesHolder.ofFloat("rotationX",0,360);
2933
ObjectAnimator animator=ObjectAnimator.ofPropertyValuesHolder(getTarget(), rotation6);
3034
animator.setInterpolator(new LinearInterpolator());
3135
animator.setRepeatCount(-1);
3236
animator.setDuration(1500);
3337
animator.start();
34-
addAnimation(animator);
38+
List<Animator> animators=new ArrayList<>();
39+
animators.add(animator);
40+
return animators;
3541
}
3642
}

‎library/src/main/java/com/wang/avi/indicator/BallPulseSyncIndicator.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
import android.graphics.Canvas;
44
import android.graphics.Paint;
55

6+
import com.nineoldandroids.animation.Animator;
67
import com.nineoldandroids.animation.ValueAnimator;
78

9+
import java.util.ArrayList;
10+
import java.util.List;
11+
812
/**
913
* Created by Jack on 2015/10/19.
1014
*/
@@ -27,7 +31,8 @@ public void draw(Canvas canvas, Paint paint) {
2731
}
2832

2933
@Override
30-
public void createAnimation() {
34+
public List<Animator> createAnimation() {
35+
List<Animator> animators=new ArrayList<>();
3136
float circleSpacing=4;
3237
float radius=(getWidth()-circleSpacing*2)/6;
3338
int[] delays=new int[]{70,140,210};
@@ -45,8 +50,9 @@ public void onAnimationUpdate(ValueAnimator animation) {
4550
}
4651
});
4752
scaleAnim.start();
48-
addAnimation(scaleAnim);
53+
animators.add(scaleAnim);
4954
}
55+
return animators;
5056
}
5157

5258
}

‎library/src/main/java/com/wang/avi/indicator/BallRotateIndicator.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22

33
import android.graphics.Canvas;
44
import android.graphics.Paint;
5+
6+
import com.nineoldandroids.animation.Animator;
57
import com.nineoldandroids.animation.ObjectAnimator;
68
import com.nineoldandroids.animation.ValueAnimator;
79

10+
import java.util.ArrayList;
11+
import java.util.List;
12+
813
/**
914
* Created by Jack on 2015/10/17.
1015
*/
@@ -39,7 +44,8 @@ public void draw(Canvas canvas, Paint paint) {
3944
}
4045

4146
@Override
42-
public void createAnimation() {
47+
public List<Animator> createAnimation() {
48+
List<Animator> animators=new ArrayList<>();
4349
ValueAnimator scaleAnim=ValueAnimator.ofFloat(0.5f,1,0.5f);
4450
scaleAnim.setDuration(1000);
4551
scaleAnim.setRepeatCount(-1);
@@ -57,7 +63,9 @@ public void onAnimationUpdate(ValueAnimator animation) {
5763
rotateAnim.setRepeatCount(-1);
5864
rotateAnim.start();
5965

60-
addAnimation(scaleAnim,rotateAnim);
66+
animators.add(scaleAnim);
67+
animators.add(rotateAnim);
68+
return animators;
6169
}
6270

6371

0 commit comments

Comments
 (0)