Skip to content

Commit 20e4db6

Browse files
Small fixes
1 parent 2cf348c commit 20e4db6

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

app/src/main/java/com/eudycontreras/indicatoreffect/MainActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ class MainActivity : AppCompatActivity() {
3232
indicator.indicatorStrokeColor = ContextCompat.getColor(this, R.color.colorAccent)
3333
indicator.indicatorColorStart = ContextCompat.getColor(this, R.color.white)
3434
indicator.indicatorColorEnd = ContextCompat.getColor(this, R.color.colorAccent)
35-
indicator.indicatorCount = 5
35+
indicator.indicatorCount = 3
3636
indicator.indicatorMinOpacity = 0f
3737
indicator.indicatorMaxOpacity = 1f
3838
indicator.indicatorRepeatMode = IndicatorView.REPEAT_MODE_RESTART
3939
indicator.indicatorRepeats = IndicatorView.INFINITE_REPEATS
40-
indicator.indicatorDuration = 2000
41-
indicator.indicatorStrokeWidth = 10f
40+
indicator.indicatorDuration = 7000
41+
indicator.indicatorStrokeWidth = 0f
4242
indicator.isShowBorderStroke = false
4343
indicator.revealDuration = 0
4444
indicator.isUseColorInterpolation = false

indicatoreffectlib/src/main/java/com/eudycontreras/indicatoreffectlib/views/IndicatorView.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,8 @@ public interface IndicatorLayoutBehaviour {
6464
private int indicatorStrokeColor;
6565
private int indicatorColorStart;
6666
private int indicatorColorEnd;
67-
private int indicatorDelay;
6867
private int indicatorRepeats;
6968
private int indicatorRepeatMode;
70-
private int indicatorDuration;
71-
private int indicatorIntervalDelay;
7269
private int indicatorInnerOutlineColor;
7370

7471
private int usableWidth;
@@ -102,8 +99,11 @@ public interface IndicatorLayoutBehaviour {
10299

103100
private float indicatorStrokeWidth;
104101

105-
private long revealDuration = 300;
106-
private long concealDuration = 300;
102+
private long revealDuration = 0;
103+
private long concealDuration = 0;
104+
private long indicatorDelay;
105+
private long indicatorDuration;
106+
private long indicatorIntervalDelay;
107107

108108
private boolean showInnerOutline = false;
109109
private boolean useColorInterpolation = false;
@@ -191,6 +191,8 @@ private void initialize(ViewGroup parentView) {
191191
animators = new ArrayList<>();
192192

193193
parent = parentView;
194+
195+
initializeIndicator();
194196
}
195197

196198
public void setUpAttributes(TypedArray typedArray) {
@@ -522,8 +524,6 @@ public void setTarget(View view, float widthRatio, float heightRatio, float radi
522524

523525
target = view;
524526

525-
stopIndicatorAnimation();
526-
527527
int width = ((ViewGroup) view.getParent()).getWidth();
528528
int height = ((ViewGroup) view.getParent()).getHeight();
529529

@@ -533,8 +533,10 @@ public void setTarget(View view, float widthRatio, float heightRatio, float radi
533533
behaviour.setUpBehaviour(this, width, height);
534534
}
535535

536-
parent.removeView(this);
537-
parent.addView(this);
536+
if(this.getParent() != parent) {
537+
parent.removeView(this);
538+
parent.addView(this);
539+
}
538540

539541
int[] locationView = new int[2];
540542

@@ -679,11 +681,11 @@ public void setInnerOutLineWidth(float innerOutLineWidth) {
679681
this.innerOutLineWidth = innerOutLineWidth;
680682
}
681683

682-
public int getIndicatorIntervalDelay() {
684+
public long getIndicatorIntervalDelay() {
683685
return indicatorIntervalDelay;
684686
}
685687

686-
public void setIndicatorIntervalDelay(int indicatorIntervalDelay) {
688+
public void setIndicatorIntervalDelay(long indicatorIntervalDelay) {
687689
this.indicatorIntervalDelay = indicatorIntervalDelay;
688690
}
689691

@@ -857,11 +859,11 @@ public void setIndicatorRepeatMode(int indicatorRepeatMode) {
857859
this.indicatorRepeatMode = indicatorRepeatMode;
858860
}
859861

860-
public int getIndicatorDuration() {
862+
public long getIndicatorDuration() {
861863
return indicatorDuration;
862864
}
863865

864-
public void setIndicatorDuration(int indicatorDuration) {
866+
public void setIndicatorDuration(long indicatorDuration) {
865867
this.indicatorDuration = indicatorDuration;
866868
}
867869

0 commit comments

Comments
 (0)