Skip to content

Commit 8ea4460

Browse files
committed
Merge pull request HarlonWang#7 from selmanon/master
comment removed
2 parents 0be33a6 + 7baeaaa commit 8ea4460

File tree

3 files changed

+2
-67
lines changed

3 files changed

+2
-67
lines changed

library/src/main/java/com/wang/avi/indicator/LineSpinFadeLoaderIndicator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public void draw(Canvas canvas, Paint paint) {
2222
canvas.rotate(i*45);
2323
paint.setAlpha(alphas[i]);
2424
RectF rectF=new RectF(-radius,-radius/1.5f,1.5f*radius,radius/1.5f);
25-
/*RectF rectF=new RectF(0,0,2*radius,1f*radius);*/
2625
canvas.drawRoundRect(rectF,5,5,paint);
2726
canvas.restore();
2827
}

library/src/main/java/com/wang/avi/indicator/SquareSpinIndicator.java

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,11 @@ public class SquareSpinIndicator extends BaseIndicatorController {
1515
@Override
1616
public void draw(Canvas canvas, Paint paint) {
1717
canvas.drawRect(new RectF(getWidth()/5,getHeight()/5,getWidth()*4/5,getHeight()*4/5),paint);
18-
19-
/*Path path=new Path();
20-
path.moveTo(0,getHeight());
21-
path.lineTo(getWidth(), getHeight());
22-
path.lineTo(getWidth()/2,0);
23-
path.close();
24-
canvas.drawPath(path, paint);*/
2518
}
2619

2720
@Override
2821
public void createAnimation() {
29-
/*ObjectAnimator rotationXAnimation=ObjectAnimator.ofFloat(getTarget(), "rotationX",0,180,180,0,0);
30-
rotationXAnimation.setDuration(3000);
31-
32-
ObjectAnimator rotationYAnimation=ObjectAnimator.ofFloat(getTarget(), "rotationY",0,0,180,180,0);
33-
rotationYAnimation.setDuration(3000);
34-
35-
final AnimatorSet animatorSet=new AnimatorSet();
36-
animatorSet.playTogether(rotationXAnimation,rotationYAnimation);
37-
animatorSet.addListener(new AnimatorListenerAdapter() {
38-
@Override
39-
public void onAnimationRepeat(Animator animation) {
40-
super.onAnimationRepeat(animation);
41-
System.out.println("onAnimationRepeat");
42-
}
43-
44-
@Override
45-
public void onAnimationEnd(Animator animation) {
46-
super.onAnimationEnd(animation);
47-
System.out.println("onAnimationEnd(");
48-
animatorSet.start();
49-
}
50-
});
51-
animatorSet.start();*/
52-
53-
54-
/*PropertyValuesHolder rotation1=PropertyValuesHolder.ofFloat("rotationX",0,180,0,0,0);
55-
PropertyValuesHolder rotation2=PropertyValuesHolder.ofFloat("rotationX",0,0,180,0,0);
56-
PropertyValuesHolder rotation3=PropertyValuesHolder.ofFloat("rotationY",0,0,180,0,0);
57-
PropertyValuesHolder rotation4=PropertyValuesHolder.ofFloat("rotationY",0,0,0,180,0);*/
22+
5823

5924
PropertyValuesHolder rotation5=PropertyValuesHolder.ofFloat("rotationX",0,180,180,0,0);
6025
PropertyValuesHolder rotation6=PropertyValuesHolder.ofFloat("rotationY",0,0,180,180,0);

library/src/main/java/com/wang/avi/indicator/TriangleSkewSpinIndicator.java

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,9 @@ public void draw(Canvas canvas, Paint paint) {
2525

2626
@Override
2727
public void createAnimation() {
28-
/*ObjectAnimator rotationXAnimation=ObjectAnimator.ofFloat(getTarget(), "rotationX",0,180,180,0,0);
29-
rotationXAnimation.setDuration(3000);
30-
31-
ObjectAnimator rotationYAnimation=ObjectAnimator.ofFloat(getTarget(), "rotationY",0,0,180,180,0);
32-
rotationYAnimation.setDuration(3000);
33-
34-
final AnimatorSet animatorSet=new AnimatorSet();
35-
animatorSet.playTogether(rotationXAnimation,rotationYAnimation);
36-
animatorSet.addListener(new AnimatorListenerAdapter() {
37-
@Override
38-
public void onAnimationRepeat(Animator animation) {
39-
super.onAnimationRepeat(animation);
40-
System.out.println("onAnimationRepeat");
41-
}
42-
43-
@Override
44-
public void onAnimationEnd(Animator animation) {
45-
super.onAnimationEnd(animation);
46-
System.out.println("onAnimationEnd(");
47-
animatorSet.start();
48-
}
49-
});
50-
animatorSet.start();*/
51-
52-
53-
/*PropertyValuesHolder rotation1=PropertyValuesHolder.ofFloat("rotationX",0,180,0,0,0);
54-
PropertyValuesHolder rotation2=PropertyValuesHolder.ofFloat("rotationX",0,0,180,0,0);
55-
PropertyValuesHolder rotation3=PropertyValuesHolder.ofFloat("rotationY",0,0,180,0,0);
56-
PropertyValuesHolder rotation4=PropertyValuesHolder.ofFloat("rotationY",0,0,0,180,0);*/
57-
5828
PropertyValuesHolder rotation5=PropertyValuesHolder.ofFloat("rotationX",0,180,180,0,0);
5929
PropertyValuesHolder rotation6=PropertyValuesHolder.ofFloat("rotationY",0,0,180,180,0);
30+
6031
ObjectAnimator animator=ObjectAnimator.ofPropertyValuesHolder(getTarget(), rotation6,rotation5);
6132
animator.setInterpolator(new LinearInterpolator());
6233
animator.setRepeatCount(-1);

0 commit comments

Comments
 (0)