Skip to content

fix bug with incorrect shimmering size after requestLayout called #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix bug with incorrect shimmering size after requestLayout called #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23c5e10
fix bug with incorrect shimmering size after requestLayout called
May 21, 2018
ab71346
added updating shimmer animator while animation works
VitalyNikonorov Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions shimmerlayout/src/main/java/io/supercharge/shimmerlayout/ShimmerLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ public ShimmerLayout(Context context, AttributeSet attrs, int defStyle) {
}
}

@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
if (changed) {
updateShimmerAnimation();
}
}

@Override
protected void onDetachedFromWindow() {
resetShimmering();
Expand Down Expand Up @@ -124,7 +132,7 @@ public void startShimmerAnimation() {
return;
}

if (getWidth() == 0) {
if (getWidth() == 0 || isLayoutRequested()) {
startAnimationPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
Expand All @@ -140,7 +148,35 @@ public boolean onPreDraw() {
return;
}

Animator animator = getShimmerAnimation();
Animator animator = getShimmerAnimation(0);
animator.start();
isAnimationStarted = true;
}

private void updateShimmerAnimation() {
if (!isAnimationStarted) {
return;
}
long currentPlayTime = maskAnimator.getCurrentPlayTime();

if (getWidth() == 0 || isLayoutRequested()) {
startAnimationPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
getViewTreeObserver().removeOnPreDrawListener(this);
updateShimmerAnimation();
return true;
}
};

getViewTreeObserver().addOnPreDrawListener(startAnimationPreDrawListener);

return;
}
if (maskAnimator != null) {
resetShimmering();
}
Animator animator = getShimmerAnimation(currentPlayTime);
animator.start();
isAnimationStarted = true;
}
Expand Down Expand Up @@ -321,7 +357,7 @@ private void createShimmerPaint() {
gradientTexturePaint.setShader(composeShader);
}

private Animator getShimmerAnimation() {
private Animator getShimmerAnimation(long currentPlayTime) {
if (maskAnimator != null) {
return maskAnimator;
}
Expand All @@ -346,6 +382,7 @@ private Animator getShimmerAnimation() {
: ValueAnimator.ofInt(0, shimmerAnimationFullLength);
maskAnimator.setDuration(shimmerAnimationDuration);
maskAnimator.setRepeatCount(ObjectAnimator.INFINITE);
maskAnimator.setCurrentPlayTime(currentPlayTime);

maskAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
Expand Down