Merge pull request #14 from shts/release/3.0.0

Release/3.0.0
shts · Aug 21, 2018 · 8973640 · 8973640
2 parents b0927b1 + 6f177df
commit 8973640
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 24 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/jp/shts/android/storyprogressbar/MainActivity.java b/app/src/main/java/jp/shts/android/storyprogressbar/MainActivity.java
@@ -62,7 +62,9 @@ protected void onCreate(Bundle savedInstanceState) {
         // or
         // storiesProgressView.setStoriesCountWithDurations(durations);
         storiesProgressView.setStoriesListener(this);
-        storiesProgressView.startStories();
+//        storiesProgressView.startStories();
+        counter = 2;
+        storiesProgressView.startStories(counter);
 
         image = (ImageView) findViewById(R.id.image);
         image.setImageResource(resources[counter]);

diff --git a/library/src/main/java/jp/shts/android/storiesprogressview/PausableProgressBar.java b/library/src/main/java/jp/shts/android/storiesprogressview/PausableProgressBar.java
@@ -73,6 +73,16 @@ void setMinWithoutCallback() {
         }
     }
 
+    void setMaxWithoutCallback() {
+        maxProgressView.setBackgroundResource(R.color.progress_max_active);
+
+        maxProgressView.setVisibility(VISIBLE);
+        if (animation != null) {
+            animation.setAnimationListener(null);
+            animation.cancel();
+        }
+    }
+
     private void finishProgress(boolean isMax) {
         if (isMax) maxProgressView.setBackgroundResource(R.color.progress_max_active);
         maxProgressView.setVisibility(isMax ? VISIBLE : GONE);

diff --git a/library/src/main/java/jp/shts/android/storiesprogressview/StoriesProgressView.java b/library/src/main/java/jp/shts/android/storiesprogressview/StoriesProgressView.java
@@ -15,6 +15,8 @@
 
 public class StoriesProgressView extends LinearLayout {
 
+    private static final String TAG = StoriesProgressView.class.getSimpleName();
+
     private final LayoutParams PROGRESS_BAR_LAYOUT_PARAM = new LayoutParams(0, LayoutParams.WRAP_CONTENT, 1);
     private final LayoutParams SPACE_LAYOUT_PARAM = new LayoutParams(5, LayoutParams.WRAP_CONTENT);
 
@@ -24,17 +26,19 @@ public class StoriesProgressView extends LinearLayout {
     /**
      * pointer of running animation
      */
-    private int current = 0;
+    private int current = -1;
     private StoriesListener storiesListener;
-    boolean isReverse;
     boolean isComplete;
 
+    private boolean isSkipStart;
+    private boolean isReverseStart;
+
     public interface StoriesListener {
-        public void onNext();
+        void onNext();
 
-        public void onPrev();
+        void onPrev();
 
-        public void onComplete();
+        void onComplete();
     }
 
     public StoriesProgressView(Context context) {
@@ -114,18 +118,23 @@ public void setStoriesListener(StoriesListener storiesListener) {
      * Skip current story
      */
     public void skip() {
+        if (isSkipStart || isReverseStart) return;
         if (isComplete) return;
+        if (current < 0) return;
         PausableProgressBar p = progressBars.get(current);
+        isSkipStart = true;
         p.setMax();
     }
 
     /**
      * Reverse current story
      */
     public void reverse() {
+        if (isSkipStart || isReverseStart) return;
         if (isComplete) return;
-        isReverse = true;
+        if (current < 0) return;
         PausableProgressBar p = progressBars.get(current);
+        isReverseStart = true;
         p.setMin();
     }
 
@@ -164,8 +173,7 @@ public void onStartProgress() {
 
             @Override
             public void onFinishProgress() {
-                if (isReverse) {
-                    isReverse = false;
+                if (isReverseStart) {
                     if (storiesListener != null) storiesListener.onPrev();
                     if (0 <= (current - 1)) {
                         PausableProgressBar p = progressBars.get(current - 1);
@@ -174,6 +182,7 @@ public void onFinishProgress() {
                     } else {
                         progressBars.get(current).startProgress();
                     }
+                    isReverseStart = false;
                     return;
                 }
                 int next = current + 1;
@@ -184,6 +193,7 @@ public void onFinishProgress() {
                     isComplete = true;
                     if (storiesListener != null) storiesListener.onComplete();
                 }
+                isSkipStart = false;
             }
         };
     }
@@ -195,6 +205,16 @@ public void startStories() {
         progressBars.get(0).startProgress();
     }
 
+    /**
+     * Start progress animation from specific progress
+     */
+    public void startStories(int from) {
+        for (int i = 0; i < from; i++) {
+            progressBars.get(i).setMaxWithoutCallback();
+        }
+        progressBars.get(from).startProgress();
+    }
+
     /**
      * Need to call when Activity or Fragment destroy
      */
@@ -208,13 +228,15 @@ public void destroy() {
      * Pause story
      */
     public void pause() {
+        if (current < 0) return;
         progressBars.get(current).pauseProgress();
     }
 
     /**
      * Resume story
      */
     public void resume() {
+        if (current < 0) return;
         progressBars.get(current).resumeProgress();
     }
 }
diff --git a/library/src/main/res/layout/pausable_progress.xml b/library/src/main/res/layout/pausable_progress.xml
@@ -7,21 +7,21 @@
     <View
         android:id="@+id/back_progress"
         android:layout_width="match_parent"
-        android:layout_height="3dp"
+        android:layout_height="@dimen/progress_bar_height"
         android:background="@color/progress_secondary" />
 
     <View
         android:id="@+id/front_progress"
         android:layout_width="match_parent"
-        android:layout_height="3dp"
+        android:layout_height="@dimen/progress_bar_height"
         android:background="@color/progress_primary"
         android:visibility="invisible"
         tools:visibility="visible"/>
 
     <View
         android:id="@+id/max_progress"
         android:layout_width="match_parent"
-        android:layout_height="3dp"
+        android:layout_height="@dimen/progress_bar_height"
         android:background="#fff"
         android:visibility="gone" />
 </FrameLayout>
diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="progress_bar_height">2dp</dimen>
+</resources>