Skip to content
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

Allow for customization of starting point of animation within an individual progress bar #44

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

Allow for customization of starting point of animation within an individual progress bar #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6906885
Add customization of starting point of animation within an individual…
troutslaps Jan 14, 2021
5b55fea
remove log
troutslaps Jan 14, 2021
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
14 changes: 11 additions & 3 deletions library/src/main/java/jp/shts/android/storiesprogressview/PausableProgressBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.animation.Animation;
Expand Down Expand Up @@ -95,11 +96,18 @@ private void finishProgress(boolean isMax) {
}
}

public void startProgress() {
public void startProgress(long startTime) {
maxProgressView.setVisibility(GONE);

animation = new PausableScaleAnimation(0, 1, 1, 1, Animation.ABSOLUTE, 0, Animation.RELATIVE_TO_SELF, 0);
animation.setDuration(duration);
long remainingTime = duration - startTime;
if(remainingTime < 0) {
throw new IllegalArgumentException("Start time is greater than story duration");
}
float fromX = 1.0f - ((float)remainingTime/(float)duration);

animation = new PausableScaleAnimation(fromX, 1, 1, 1, Animation.ABSOLUTE, 0, Animation.RELATIVE_TO_SELF, 0);
animation.setDuration(remainingTime);

animation.setInterpolator(new LinearInterpolator());
animation.setAnimationListener(new Animation.AnimationListener() {
@Override
Expand Down
14 changes: 9 additions & 5 deletions library/src/main/java/jp/shts/android/storiesprogressview/StoriesProgressView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,17 @@ public void onFinishProgress() {
if (0 <= (current - 1)) {
PausableProgressBar p = progressBars.get(current - 1);
p.setMinWithoutCallback();
progressBars.get(--current).startProgress();
progressBars.get(--current).startProgress(0);
} else {
progressBars.get(current).startProgress();
progressBars.get(current).startProgress(0);
}
isReverseStart = false;
return;
}
int next = current + 1;
if (next <= (progressBars.size() - 1)) {
if (storiesListener != null) storiesListener.onNext();
progressBars.get(next).startProgress();
progressBars.get(next).startProgress(0);
} else {
isComplete = true;
if (storiesListener != null) storiesListener.onComplete();
Expand All @@ -202,17 +202,21 @@ public void onFinishProgress() {
* Start progress animation
*/
public void startStories() {
progressBars.get(0).startProgress();
progressBars.get(0).startProgress(0);
}

/**
* Start progress animation from specific progress
*/
public void startStories(int from) {
startStories(from, 0);
}

public void startStories(int from, long startTime) {
for (int i = 0; i < from; i++) {
progressBars.get(i).setMaxWithoutCallback();
}
progressBars.get(from).startProgress();
progressBars.get(from).startProgress(startTime);
}

/**
Expand Down