Skip to content

Commit 5b6d713

Browse files
ybqybq
committed
bug fixes
1 parent 499c960 commit 5b6d713

File tree

2 files changed

+93
-94
lines changed

2 files changed

+93
-94
lines changed

‎library/src/main/java/com/github/ybq/android/spinkit/sprite/SpriteGroup.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,18 @@ protected void onBoundsChange(Rect bounds) {
8989
public void start() {
9090
super.start();
9191
AnimationUtils.start(sprites);
92-
AnimationUtils.start(getAnimation());
9392
}
9493

9594
@Override
9695
public void stop() {
9796
super.stop();
9897
AnimationUtils.stop(sprites);
99-
AnimationUtils.stop(getAnimation());
10098
}
10199

102100

103101
@Override
104102
public boolean isRunning() {
105-
return AnimationUtils.isRunning(sprites) ||
106-
AnimationUtils.isRunning(getAnimation());
103+
return AnimationUtils.isRunning(sprites) ||super.isRunning();
107104
}
108105

109106
public abstract Sprite[] onCreateChild();

‎sample/src/main/java/com/github/ybq/android/loading/DetailActivity.java

Lines changed: 92 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -28,104 +28,106 @@
2828

2929
public class DetailActivity extends AppCompatActivity implements Colors {
3030

31-
public static void start(Context context, int position) {
32-
Intent intent = new Intent(context, DetailActivity.class);
33-
intent.putExtra("position", position);
34-
context.startActivity(intent);
35-
}
31+
public static void start(Context context, int position) {
32+
Intent intent = new Intent(context, DetailActivity.class);
33+
intent.putExtra("position", position);
34+
context.startActivity(intent);
35+
}
3636

37-
@Override
38-
protected void onCreate(Bundle savedInstanceState) {
39-
super.onCreate(savedInstanceState);
40-
setContentView(R.layout.activity_detail);
41-
ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
42-
viewPager.setOffscreenPageLimit(0);
43-
viewPager.setAdapter(new PagerAdapter() {
44-
String[] names = getResources().getStringArray(R.array.names);
37+
@Override
38+
protected void onCreate(Bundle savedInstanceState) {
39+
super.onCreate(savedInstanceState);
40+
setContentView(R.layout.activity_detail);
41+
ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
42+
viewPager.setOffscreenPageLimit(0);
43+
viewPager.setAdapter(new PagerAdapter() {
44+
String[] names = getResources().getStringArray(R.array.names);
4545

46-
@Override
47-
public int getCount() {
48-
return 11;
49-
}
46+
@Override
47+
public int getCount() {
48+
return 11;
49+
}
5050

51-
@Override
52-
public boolean isViewFromObject(View view, Object object) {
53-
return view == object;
54-
}
51+
@Override
52+
public boolean isViewFromObject(View view, Object object) {
53+
return view == object;
54+
}
5555

56-
@Override
57-
public Object instantiateItem(ViewGroup container, int position) {
58-
@SuppressLint("InflateParams")
59-
View view = LayoutInflater.from(container.getContext()).inflate(R.layout.item_pager,
60-
null);
61-
final SpinKitView spinKitView = (SpinKitView) view.findViewById(R.id.spin_kit);
62-
TextView name = (TextView) view.findViewById(R.id.name);
63-
name.setText(names[position]);
64-
Sprite drawable = null;
65-
switch (position) {
66-
case 0:
67-
drawable = new RotatingPlane();
68-
break;
69-
case 1:
70-
drawable = new DoubleBounce();
71-
break;
72-
case 2:
73-
drawable = new Wave();
74-
break;
75-
case 3:
76-
drawable = new WanderingCubes();
77-
break;
78-
case 4:
79-
drawable = new Pulse();
80-
break;
81-
case 5:
82-
drawable = new ChasingDots();
83-
break;
84-
case 6:
85-
drawable = new ThreeBounce();
86-
break;
87-
case 7:
88-
drawable = new Circle();
89-
break;
90-
case 8:
91-
drawable = new CubeGrid();
92-
break;
93-
case 9:
94-
drawable = new FadingCircle();
95-
break;
96-
case 10:
97-
drawable = new FoldingCube();
98-
break;
99-
}
100-
spinKitView.setIndeterminateDrawable(drawable);
101-
container.addView(view);
56+
@Override
57+
public Object instantiateItem(ViewGroup container, int position) {
58+
@SuppressLint("InflateParams")
59+
View view = LayoutInflater.from(container.getContext()).inflate(R.layout.item_pager,
60+
null);
61+
final SpinKitView spinKitView = (SpinKitView) view.findViewById(R.id.spin_kit);
62+
TextView name = (TextView) view.findViewById(R.id.name);
63+
name.setText(names[position]);
64+
Sprite drawable = null;
65+
switch (position) {
66+
case 0:
67+
drawable = new RotatingPlane();
68+
break;
69+
case 1:
70+
drawable = new DoubleBounce();
71+
break;
72+
case 2:
73+
drawable = new Wave();
74+
break;
75+
case 3:
76+
drawable = new WanderingCubes();
77+
break;
78+
case 4:
79+
drawable = new Pulse();
80+
break;
81+
case 5:
82+
drawable = new ChasingDots();
83+
break;
84+
case 6:
85+
drawable = new ThreeBounce();
86+
break;
87+
case 7:
88+
drawable = new Circle();
89+
break;
90+
case 8:
91+
drawable = new CubeGrid();
92+
break;
93+
case 9:
94+
drawable = new FadingCircle();
95+
break;
96+
case 10:
97+
drawable = new FoldingCube();
98+
break;
99+
}
100+
spinKitView.setIndeterminateDrawable(drawable);
101+
container.addView(view);
102102

103-
return view;
104-
}
103+
return view;
104+
}
105105

106-
@Override
107-
public void destroyItem(ViewGroup container, int position, Object object) {
108-
container.removeView((View) object);
109-
}
110-
});
111-
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
112-
@Override
113-
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
114-
int color = (int) ArgbEvaluator.getInstance().evaluate(positionOffset, colors[position], colors[position + 1]);
115-
getWindow().getDecorView().setBackgroundColor(color);
116-
}
106+
@Override
107+
public void destroyItem(ViewGroup container, int position, Object object) {
108+
container.removeView((View) object);
109+
}
110+
});
111+
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
112+
@Override
113+
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
114+
int color = (int) ArgbEvaluator.getInstance().evaluate(positionOffset,
115+
colors[position % colors.length],
116+
colors[(position + 1) % colors.length]);
117+
getWindow().getDecorView().setBackgroundColor(color);
118+
}
117119

118-
@Override
119-
public void onPageSelected(int position) {
120-
getWindow().getDecorView().setBackgroundColor(colors[position]);
121-
}
120+
@Override
121+
public void onPageSelected(int position) {
122+
getWindow().getDecorView().setBackgroundColor(colors[position % colors.length]);
123+
}
122124

123-
@Override
124-
public void onPageScrollStateChanged(int state) {
125+
@Override
126+
public void onPageScrollStateChanged(int state) {
125127

126-
}
127-
});
128+
}
129+
});
128130

129-
viewPager.setCurrentItem(getIntent().getIntExtra("position", 0));
130-
}
131+
viewPager.setCurrentItem(getIntent().getIntExtra("position", 0));
132+
}
131133
}

0 commit comments

Comments
 (0)