Added resume() function

Added isPaused() function
carlosmuvi · Jul 6, 2017 · a6ef942 · a6ef942
1 parent f5da7c8
commit a6ef942
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/carlosmuvi/sample/MainActivity.java b/app/src/main/java/com/carlosmuvi/sample/MainActivity.java
@@ -11,7 +11,7 @@ public class MainActivity extends AppCompatActivity {
     SegmentedProgressBar segmentedProgressBar;
     Button startButton;
     Button startWithoutAnimationButton;
-    Button pauseButton;
+    Button pauseResumeButton;
     Button resetButton;
 
     @Override protected void onCreate(Bundle savedInstanceState) {
@@ -21,7 +21,7 @@ public class MainActivity extends AppCompatActivity {
         initSegmentedProgressBar();
 
         startButton = (Button) findViewById(R.id.button);
-        pauseButton = (Button) findViewById(R.id.button3);
+        pauseResumeButton = (Button) findViewById(R.id.button3);
         resetButton = (Button) findViewById(R.id.button2);
         startWithoutAnimationButton = (Button) findViewById(R.id.button4);
 
@@ -31,9 +31,13 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        pauseButton.setOnClickListener(new View.OnClickListener() {
+        pauseResumeButton.setOnClickListener(new View.OnClickListener() {
             @Override public void onClick(View view) {
-                segmentedProgressBar.pause();
+                if (segmentedProgressBar.isPaused()) {
+                    segmentedProgressBar.resume();
+                } else {
+                    segmentedProgressBar.pause();
+                }
             }
         });
         startWithoutAnimationButton.setOnClickListener(new View.OnClickListener() {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
       android:layout_alignParentRight="true"
       android:layout_alignParentStart="true"
       android:layout_below="@+id/button"
-      android:text="Pause"
+      android:text="Pause/Resume"
       />
 
   <Button

diff --git a/library/src/main/java/com/carlosmuvi/segmentedprogressbar/DrawingTimer.java b/library/src/main/java/com/carlosmuvi/segmentedprogressbar/DrawingTimer.java
@@ -50,6 +50,13 @@ public void pause() {
         }
     }
 
+    public void resume() {
+        if (timerState == TimerState.PAUSED) {
+            timerState = TimerState.RUNNING;
+            runDrawingTask();
+        }
+    }
+
     public void reset() {
         pause();
         timerState = TimerState.IDLE;

diff --git a/library/src/main/java/com/carlosmuvi/segmentedprogressbar/SegmentedProgressBar.kt b/library/src/main/java/com/carlosmuvi/segmentedprogressbar/SegmentedProgressBar.kt
@@ -88,9 +88,10 @@ class SegmentedProgressBar : View {
     }
   }
 
-  fun pause() {
-    drawingTimer.pause()
-  }
+  fun pause() = drawingTimer.pause()
+  fun resume() = drawingTimer.resume()
+  fun reset() = setCompletedSegments(0)
+  fun isPaused() = drawingTimer.isPaused
 
   fun setCompletedSegments(completedSegments: Int) {
     if (completedSegments <= properties.segmentCount) {
@@ -110,10 +111,6 @@ class SegmentedProgressBar : View {
     }
   }
 
-  fun reset() {
-    setCompletedSegments(0)
-  }
-
   /*
     PRIVATE METHODS
      */