Skip to content

Commit b1f5a75

Browse files
lightSkylightSky
committed
finish refactor
1 parent b7b2a1b commit b1f5a75

19 files changed

+390
-316
lines changed

‎InfiniteIndicator.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="jdk" jdkName="Android API 23 Platform (2)" jdkType="Android SDK" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.0.0-alpha5'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
8+
classpath 'com.android.tools.build:gradle:2.2.0'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
1010
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
1111

1212
// NOTE: Do not place your application dependencies here; they belong

‎demo/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
}
2626

2727
dependencies {
28-
compile 'cn.lightsky.infiniteindicator:library:1.1.0'
29-
// compile project(':library')
28+
// compile 'cn.lightsky.infiniteindicator:library:1.1.0'
29+
compile project(':library')
3030
compile files('libs/universal-image-loader-1.9.5.jar')
3131
compile 'com.squareup.picasso:picasso:2.4.0'
3232
compile 'com.github.bumptech.glide:glide:3.7.0'

‎demo/demo.iml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4244
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4345
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -47,65 +49,65 @@
4749
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4850
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4951
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5053
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5154
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5457
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5558
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5659
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5761
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6064
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6165
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6266
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6367
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
6570
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
6671
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
6772
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
6873
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
6974
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7075
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7177
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7278
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7379
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7480
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7581
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7682
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7783
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7885
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7986
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/cn.lightsky.infiniteindicator/library/1.1.0/jars" />
8490
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtimfe-classes" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
8992
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9093
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9194
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
9395
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
9596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9698
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9799
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
98100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
99101
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
100102
</content>
101103
<orderEntry type="jdk" jdkName="Android API 23 Platform (2)" jdkType="Android SDK" />
102104
<orderEntry type="sourceFolder" forTests="false" />
103-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
104-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
105-
<orderEntry type="library" exported="" name="library-1.1.0" level="project" />
106-
<orderEntry type="library" exported="" name="universal-image-loader-1.9.5" level="project" />
107-
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
108105
<orderEntry type="library" exported="" name="picasso-2.4.0" level="project" />
109106
<orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
107+
<orderEntry type="library" exported="" name="universal-image-loader-1.9.5" level="project" />
108+
<orderEntry type="module" module-name="library" exported="" />
109+
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
110+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
111+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
110112
</component>
111113
</module>

‎demo/src/main/java/cn/lightsky/infiniteindicator/AnimIndicatorActivity.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,27 @@ public boolean onOptionsItemSelected(MenuItem item) {
6969

7070
private void testAnimCircleIndicator() {
7171
mAnimCircleIndicator = (InfiniteIndicator)findViewById(R.id.infinite_anim_circle);
72-
mAnimCircleIndicator.setImageLoader(new UILoader());
73-
mAnimCircleIndicator.addPages(pageViews);
74-
mAnimCircleIndicator.setPosition(InfiniteIndicator.IndicatorPosition.Center);
75-
mAnimCircleIndicator.setOnPageChangeListener(this);
72+
IndicatorConfiguration configuration = new IndicatorConfiguration.Builder()
73+
.imageLoader(new UILoader())
74+
.pages(pageViews)
75+
.isStopWhenTouch(true)
76+
.setOnPageChangeListener(this)
77+
.setPosition(IndicatorConfiguration.IndicatorPosition.Center)
78+
.build();
79+
mAnimCircleIndicator.init(configuration);
7680
}
7781

7882
private void testAnimLineIndicator() {
7983
mAnimLineIndicator = (InfiniteIndicator)findViewById(R.id.infinite_anim_line);
80-
mAnimLineIndicator.setImageLoader(new PicassoLoader());
81-
mAnimLineIndicator.addPages(pageViews);
82-
mAnimLineIndicator.setPosition(InfiniteIndicator.IndicatorPosition.Center);
84+
IndicatorConfiguration configuration = new IndicatorConfiguration.Builder()
85+
.imageLoader(new PicassoLoader())
86+
.pages(pageViews)
87+
.isAutoScroll(false)
88+
.setOnPageChangeListener(this)
89+
.isStopWhenTouch(true)
90+
.setPosition(IndicatorConfiguration.IndicatorPosition.Center)
91+
.build();
92+
mAnimLineIndicator.init(configuration);
8393
}
8494

8595
@Override

‎demo/src/main/java/cn/lightsky/infiniteindicator/DefaultCircleIndicatorActivity.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,20 @@ protected void onResume() {
4848

4949
private void testCircleIndicator() {
5050
mDefaultIndicator = (InfiniteIndicator) findViewById(R.id.indicator_default_circle);
51-
mDefaultIndicator.setImageLoader(new UILoader());
52-
mDefaultIndicator.addPages(mPageViews);
53-
mDefaultIndicator.setPosition(InfiniteIndicator.IndicatorPosition.Center_Bottom);
51+
IndicatorConfiguration configuration = new IndicatorConfiguration.Builder()
52+
.imageLoader(new UILoader())
53+
.pages(mPageViews)
54+
.setPosition(IndicatorConfiguration.IndicatorPosition.Center_Bottom)
55+
.build();
5456
}
5557

5658
private void testCustomeCircleIndicator() {
5759
mCustoemCircleIndicator = (InfiniteIndicator) findViewById(R.id.indicator_custome_circle);
58-
mCustoemCircleIndicator.setImageLoader(new PicassoLoader());
59-
mCustoemCircleIndicator.addPages(mPageViews);
60-
mCustoemCircleIndicator.setPosition(InfiniteIndicator.IndicatorPosition.Center_Bottom);
60+
IndicatorConfiguration configuration = new IndicatorConfiguration.Builder()
61+
.imageLoader(new PicassoLoader())
62+
.pages(mPageViews)
63+
.setPosition(IndicatorConfiguration.IndicatorPosition.Center_Bottom)
64+
.build();
6165

6266
CircleIndicator circleIndicator = ((CircleIndicator) mCustoemCircleIndicator.getPagerIndicator());
6367
final float density = getResources().getDisplayMetrics().density;

‎demo/src/main/java/cn/lightsky/infiniteindicator/GlideLoader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
public class GlideLoader implements ImageLoader {
2020

21-
@Override
2221
public void initLoader(Context context) {
2322

2423
}

‎demo/src/main/java/cn/lightsky/infiniteindicator/PicassoLoader.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ public PicassoLoader getImageLoader(Context context) {
1919
return new PicassoLoader();
2020
}
2121

22-
@Override
23-
public void initLoader(Context context) {
24-
25-
}
26-
2722
@Override
2823
public void load(Context context,ImageView targetView, Object res) {
2924
if (res == null) {

‎demo/src/main/java/cn/lightsky/infiniteindicator/UILoader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public UILoader getImageLoader(Context context) {
2525
return uilLoader;
2626
}
2727

28-
@Override
2928
public void initLoader(Context context) {
3029
com.nostra13.universalimageloader.core.ImageLoader.getInstance().init(ImageLoaderConfiguration.createDefault(context));
3130

‎demo/src/main/java/test/UpdateSlidersActivity.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void onPageClick(int position, Page page) {
6464
pageViews.add(c);
6565
pageViews.add(d);
6666

67-
mAnimCircleIndicator.addPages(pageViews);
67+
// mAnimCircleIndicator.addPages(pageViews);
6868

6969
Toast.makeText(UpdateSlidersActivity.this, page.data + "",
7070
Toast.LENGTH_LONG).show();
@@ -82,7 +82,7 @@ public void onPageClick(int position, Page page) {
8282
pageViews.add(a);
8383
pageViews.add(b);
8484

85-
mAnimCircleIndicator.addPages(pageViews);
85+
// mAnimCircleIndicator.addPages(pageViews);
8686

8787
Toast.makeText(UpdateSlidersActivity.this, page.data + "",
8888
Toast.LENGTH_LONG).show();
@@ -109,7 +109,7 @@ public void onPageClick(int position, Page page) {
109109
pageViews.add(d);
110110
pageViews.add(h);
111111

112-
mAnimCircleIndicator.addPages(pageViews);
112+
// mAnimCircleIndicator.addPages(pageViews);
113113
Toast.makeText(UpdateSlidersActivity.this, page.data + "",
114114
Toast.LENGTH_LONG).show();
115115
}
@@ -124,7 +124,7 @@ public void onPageClick(int position, Page page) {
124124
pageViews.clear();
125125
pageViews.add(a);
126126

127-
mAnimCircleIndicator.addPages(pageViews);
127+
// mAnimCircleIndicator.addPages(pageViews);
128128
Toast.makeText(UpdateSlidersActivity.this, page.data + "",
129129
Toast.LENGTH_LONG).show();
130130
}
@@ -135,8 +135,8 @@ public void onPageClick(int position, Page page) {
135135
pageViews.add(c);
136136
pageViews.add(d);
137137

138-
mAnimCircleIndicator.setImageLoader(new PicassoLoader());
139-
mAnimCircleIndicator.addPages(pageViews);
138+
// mAnimCircleIndicator.setImageLoader(new PicassoLoader());
139+
// mAnimCircleIndicator.addPages(pageViews);
140140
}
141141

142142

0 commit comments

Comments
 (0)