Skip to content

Commit d0b6f58

Browse files
ATHBKATHBK
authored andcommitted
Update
Fix null point size adapter
1 parent 9e3cf33 commit d0b6f58

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

app/app.iml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

indicatorview/src/main/java/com/athbk/indicatorview/IndicatorView.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public IndicatorView(Context context, AttributeSet attrs, int defStyleAttr) {
7676

7777
@Override
7878
protected void onDraw(Canvas canvas) {
79-
if (indicators == null) return;
79+
if (indicators == null || indicators.length == 0) return;
8080
for (int i=0; i<indicators.length; i++){
8181
indicators[i].draw(canvas);
8282
}
@@ -95,6 +95,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
9595
@Override
9696
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
9797
if (viewPager == null) return;
98+
if (indicators == null || indicators.length == 0) return;
9899
int haftWidth = getWidth() / 2;
99100
int count = viewPager.getAdapter().getCount();
100101
int y = getHeight()/2;
@@ -130,6 +131,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
130131

131132
@Override
132133
public void onPageSelected(int position) {
134+
if (indicators == null || indicators.length == 0) return;
133135
beforePosition = currentPosition;
134136
currentPosition = position;
135137
if (beforePosition == currentPosition) return;
@@ -156,6 +158,7 @@ public void setViewPager(ViewPager viewPager) {
156158
this.viewPager = viewPager;
157159
viewPager.addOnPageChangeListener(this);
158160
int count = viewPager.getAdapter().getCount();
161+
if (count == 0) return;
159162
indicators = new Indicator[viewPager.getAdapter().getCount()];
160163
for (int i = 0; i < count; i++){
161164
indicators[i] = indicatorFactory.getIndicatorBasic(type, radius, i == 0);

0 commit comments

Comments
 (0)