Skip to content

Commit 2afbb45

Browse files
start141start141
committed
update sample.
1 parent dcae39d commit 2afbb45

6 files changed

Lines changed: 134 additions & 136 deletions

File tree

‎library/src/main/java/com/github/ybq/android/spinkit/style/Wave.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,5 @@ public ValueAnimator getAnimation() {
5252
.build();
5353
}
5454

55-
@Override
56-
public void onAnimationUpdate(ValueAnimator animation) {
57-
invalidateSelf();
58-
}
5955
}
6056
}

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

Lines changed: 95 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Context;
55
import android.content.Intent;
66
import android.os.Bundle;
7+
import android.support.v4.content.ContextCompat;
78
import android.support.v4.view.PagerAdapter;
89
import android.support.v4.view.ViewPager;
910
import android.support.v7.app.AppCompatActivity;
@@ -28,106 +29,108 @@
2829

2930
public class DetailActivity extends AppCompatActivity implements Colors {
3031

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-
}
32+
public static void start(Context context, int position) {
33+
Intent intent = new Intent(context, DetailActivity.class);
34+
intent.putExtra("position", position);
35+
context.startActivity(intent);
36+
}
3637

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

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

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

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

103-
return view;
104-
}
105+
return view;
106+
}
105107

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-
}
108+
@Override
109+
public void destroyItem(ViewGroup container, int position, Object object) {
110+
container.removeView((View) object);
111+
}
112+
});
119113

120-
@Override
121-
public void onPageSelected(int position) {
122-
getWindow().getDecorView().setBackgroundColor(colors[position % colors.length]);
123-
}
114+
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
115+
@Override
116+
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
117+
int color = (int) ArgbEvaluator.getInstance().evaluate(positionOffset,
118+
colors[position % colors.length],
119+
colors[(position + 1) % colors.length]);
120+
getWindow().getDecorView().setBackgroundColor(color);
121+
}
124122

125-
@Override
126-
public void onPageScrollStateChanged(int state) {
123+
@Override
124+
public void onPageSelected(int position) {
125+
getWindow().getDecorView().setBackgroundColor(colors[position % colors.length]);
126+
}
127127

128-
}
129-
});
128+
@Override
129+
public void onPageScrollStateChanged(int state) {
130130

131-
viewPager.setCurrentItem(getIntent().getIntExtra("position", 0));
132-
}
131+
}
132+
});
133+
134+
viewPager.setCurrentItem(getIntent().getIntExtra("position", 0));
135+
}
133136
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,4 @@ public CharSequence getPageTitle(int position) {
4747
mTabLayout.setupWithViewPager(mViewPager);
4848
}
4949

50-
5150
}

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.os.Bundle;
44
import android.support.annotation.Nullable;
55
import android.support.v4.app.Fragment;
6+
import android.support.v4.content.ContextCompat;
67
import android.support.v7.widget.GridLayoutManager;
78
import android.support.v7.widget.RecyclerView;
89
import android.view.LayoutInflater;
@@ -28,10 +29,6 @@
2829
*/
2930
public class Page1Fragment extends Fragment implements Colors {
3031

31-
32-
private RecyclerView recyclerView;
33-
34-
3532
public static Page1Fragment newInstance() {
3633
return new Page1Fragment();
3734
}
@@ -45,7 +42,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
4542
@Override
4643
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
4744
super.onViewCreated(view, savedInstanceState);
48-
recyclerView = (RecyclerView) view.findViewById(R.id.list);
45+
46+
RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.list);
4947
recyclerView.setBackgroundColor(colors[4]);
5048
GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 3);
5149
layoutManager.setOrientation(GridLayoutManager.VERTICAL);
@@ -65,14 +63,13 @@ public void onBindViewHolder(Holder holder, int position) {
6563

6664
@Override
6765
public int getItemCount() {
68-
return 11;
66+
return 33;
6967
}
7068
});
7169
}
7270

7371
class Holder extends RecyclerView.ViewHolder {
7472

75-
7673
SpinKitView spinKitView;
7774

7875
public Holder(View itemView) {
@@ -88,6 +85,7 @@ public void onClick(View v) {
8885
DetailActivity.start(v.getContext(), position);
8986
}
9087
});
88+
9189
Sprite drawable = null;
9290
switch (position) {
9391
case 0:
@@ -107,6 +105,7 @@ public void onClick(View v) {
107105
break;
108106
case 5:
109107
drawable = new ChasingDots();
108+
drawable.setColor(ContextCompat.getColor(getContext(), R.color.colorAccent));
110109
break;
111110
case 6:
112111
drawable = new ThreeBounce();

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

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.ybq.android.loading;
22

3-
import android.annotation.SuppressLint;
43
import android.graphics.Color;
54
import android.os.Bundle;
65
import android.support.annotation.Nullable;
@@ -23,6 +22,9 @@
2322
*/
2423
public class Page2Fragment extends Fragment implements Colors {
2524

25+
private Wave mWaveDrawable;
26+
private Circle mCircleDrawable;
27+
private ChasingDots mChasingDotsDrawable;
2628

2729
public static Page2Fragment newInstance() {
2830
return new Page2Fragment();
@@ -31,9 +33,7 @@ public static Page2Fragment newInstance() {
3133
@Nullable
3234
@Override
3335
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
34-
@SuppressLint("InflateParams")
35-
View view = inflater.inflate(R.layout.fragment_page2, null);
36-
return view;
36+
return inflater.inflate(R.layout.fragment_page2, null);
3737
}
3838

3939
@Override
@@ -43,40 +43,47 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
4343
//ProgressBar
4444
ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.progress);
4545
DoubleBounce doubleBounce = new DoubleBounce();
46-
doubleBounce.setBounds(0, 0,
47-
100,
48-
100);
46+
doubleBounce.setBounds(0, 0, 100, 100);
4947
doubleBounce.setColor(colors[7]);
5048
progressBar.setIndeterminateDrawable(doubleBounce);
5149

5250
//Button
5351
Button button = (Button) view.findViewById(R.id.button);
54-
Wave wave = new Wave();
55-
wave.setBounds(0, 0,
56-
100,
57-
100);
52+
mWaveDrawable = new Wave();
53+
mWaveDrawable.setBounds(0, 0, 100, 100);
5854
//noinspection deprecation
59-
wave.setColor(getResources().getColor(R.color.colorAccent));
60-
button.setCompoundDrawables(wave, null, null, null);
61-
wave.start();
55+
mWaveDrawable.setColor(getResources().getColor(R.color.colorAccent));
56+
button.setCompoundDrawables(mWaveDrawable, null, null, null);
6257

6358
//TextView
6459
TextView textView = (TextView) view.findViewById(R.id.text);
65-
Circle circle = new Circle();
66-
circle.setBounds(0, 0,
67-
100,
68-
100);
69-
circle.setColor(Color.WHITE);
70-
textView.setCompoundDrawables(null, null, circle, null);
60+
mCircleDrawable = new Circle();
61+
mCircleDrawable.setBounds(0, 0, 100, 100);
62+
mCircleDrawable.setColor(Color.WHITE);
63+
textView.setCompoundDrawables(null, null, mCircleDrawable, null);
7164
textView.setBackgroundColor(colors[2]);
72-
circle.start();
7365

7466
//ImageView
7567
ImageView imageView = (ImageView) view.findViewById(R.id.image);
76-
ChasingDots chasingDots = new ChasingDots();
77-
chasingDots.setColor(Color.WHITE);
78-
imageView.setImageDrawable(chasingDots);
68+
mChasingDotsDrawable = new ChasingDots();
69+
mChasingDotsDrawable.setColor(Color.WHITE);
70+
imageView.setImageDrawable(mChasingDotsDrawable);
7971
imageView.setBackgroundColor(colors[0]);
80-
chasingDots.start();
72+
}
73+
74+
@Override
75+
public void onResume() {
76+
super.onResume();
77+
mWaveDrawable.start();
78+
mCircleDrawable.start();
79+
mChasingDotsDrawable.start();
80+
}
81+
82+
@Override
83+
public void onStop() {
84+
super.onStop();
85+
mWaveDrawable.stop();
86+
mCircleDrawable.stop();
87+
mChasingDotsDrawable.stop();
8188
}
8289
}

0 commit comments

Comments
 (0)