Adds full ability to launch and fill the progress loader.

nkopilovskii · Jan 23, 2016 · d00a4ea · d00a4ea
1 parent 04ce2c3
commit d00a4ea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/ARSLineProgress/ARSLineProgress/ARSLineProgress.swift b/ARSLineProgress/ARSLineProgress/ARSLineProgress.swift
@@ -189,14 +189,13 @@ private extension InfiniteLoader {
 
 private final class ProgressLoader: Appearable {
 
-    static weak var weakSelf: ProgressLoader?
-
     var backgroundView: UIVisualEffectView
     var outerCircle = CAShapeLayer()
     var middleCircle = CAShapeLayer()
     var innerCircle = CAShapeLayer()
     var multiplier: CGFloat = 1.0
     var progress: CGFloat = 0.0
+    static weak var weakSelf: ProgressLoader?
 
     init() {
         backgroundView = BlurredBackgroundRect().view
@@ -244,11 +243,6 @@ private extension ProgressLoader {
     }
 
     func incrementCircleRadius() {
-        if self.progress >= 100 {
-            ProgressLoader.weakSelf = nil
-            completed()
-            return
-        }
         incrementMultiplier()
 
         let viewBounds = backgroundView.bounds
@@ -261,6 +255,11 @@ private extension ProgressLoader {
         self.outerCircle.path = outerPath.CGPath
         self.middleCircle.path = middlePath.CGPath
         self.innerCircle.path = innerPath.CGPath
+
+        if multiplier >= 100 {
+            ProgressLoader.weakSelf = nil
+            completed()
+        }
     }
 
     func incrementMultiplier() {

diff --git a/ARSLineProgress/ViewController.swift b/ARSLineProgress/ViewController.swift
@@ -9,8 +9,6 @@
 import UIKit
 
 final class ViewController: UIViewController {
-
-    var progress:CGFloat = 0.0
 
     @IBAction func showInfiniteLoader(sender: AnyObject) {
         ARSLineProgress.show()
@@ -21,14 +19,24 @@ final class ViewController: UIViewController {
         launchTimer()
     }
 
+}
+
+
+// MARK: Helper Demo Methods
+
+private var progress:CGFloat = 0.0
+
+extension ViewController {
+
     private func launchTimer() {
         let dispatchTime = dispatch_time(DISPATCH_TIME_NOW, Int64(0.7 * Double(NSEC_PER_SEC)));
         dispatch_after(dispatchTime, dispatch_get_main_queue(), {
-            self.progress += CGFloat(arc4random_uniform(10))
-            ARSLineProgress.updateWithProgress(self.progress)
+            progress += CGFloat(arc4random_uniform(10))
+            ARSLineProgress.updateWithProgress(progress)
             self.launchTimer()
 
-            if self.progress >= 100 {
+            if progress >= 100 {
+                progress = 0
                 self.hideLoader()
                 return
             }