Pedro Farina - Bronze + Prata

CustomView.xcodeproj/xcuserdata/pedrogiulianofarina.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>

CustomView.xcodeproj/xcuserdata/pedrogiulianofarina.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CustomView.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

CustomView/Controllers/ProgressBarViewController.swift

@@ -40,5 +40,13 @@ class ProgressBarViewController: UITableViewController {
     @IBAction func targetChange(_ sender: Any) {
         self.progressBarView?.targetValue = CGFloat(self.targetSlider.value)
     }
+
+    @IBAction func tapTargetOccur(_ sender:UITapGestureRecognizer){
+        self.progressBarView?.targetColor = sender.view?.backgroundColor ?? .gray
+    }
+
+    @IBAction func tapProgressOccur(_ sender:UITapGestureRecognizer){
+        self.progressBarView?.progressColor = sender.view?.backgroundColor ?? .red
+    }
 }
 

CustomView/Controllers/ProgressCircleViewController.swift

@@ -9,36 +9,79 @@
 import UIKit
 
 class ProgressCircleViewController: UITableViewController {
-
-    @IBOutlet weak var progressCircleView: ProgressCircleView?
+    @IBOutlet var progressViews: [ProgressCircleView]!
+
     @IBOutlet weak var widthSlider: UISlider!
     @IBOutlet weak var progressSlider: UISlider!
     @IBOutlet weak var targetSlider: UISlider!
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        self.progressCircleView?.circleWidth = CGFloat(self.widthSlider.value)
-        self.progressCircleView?.progressValue = CGFloat(self.progressSlider.value)
-        self.progressCircleView?.targetValue = CGFloat(self.targetSlider.value)
+        setValues(width: CGFloat(self.widthSlider.value), progress: CGFloat(self.progressSlider.value), target: CGFloat(self.targetSlider.value))
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
 
-        self.progressCircleView?.setNeedsDisplay()
+        for chart in progressViews{
+            chart.setNeedsDisplay()
+        }
     }
 
     @IBAction func widthChange(_ sender: Any) {
-        self.progressCircleView?.circleWidth = CGFloat(self.widthSlider.value)
+        setValues(width: CGFloat(self.widthSlider.value))
     }
 
     @IBAction func progessChange(_ sender: Any) {
-        self.progressCircleView?.progressValue = CGFloat(self.progressSlider.value)
+        setValues(progress: CGFloat(self.progressSlider.value))
     }
 
     @IBAction func targetChange(_ sender: Any) {
-        self.progressCircleView?.targetValue = CGFloat(self.targetSlider.value)
+        setValues(target: CGFloat(self.targetSlider.value))
+    }
+
+
+
+    func setValues(width:CGFloat){
+        setValues(width: width, progress: nil, target: nil)
+    }
+
+    func setValues(progress:CGFloat){
+        setValues(width: nil, progress: progress, target: nil)
+    }
+
+    func setValues(target:CGFloat){
+        setValues(width: nil, progress: nil, target: target)
+    }
+    func setValues(width:CGFloat?, progress:CGFloat?, target:CGFloat?){
+        if let width = width{
+            for chart in progressViews{
+                chart.circleWidth = width
+            }
+        }
+        if let progress = progress{
+            for chart in progressViews{
+                chart.progressValue = progress
+            }
+        }
+        if let target = target{
+            for chart in progressViews{
+                chart.targetValue = target
+            }
+        }
+    }
+
+    @IBAction func tapTargetOccur(_ sender : UITapGestureRecognizer){
+        for chart in progressViews{
+            chart.targetColor = sender.view?.backgroundColor ?? .gray
+        }
+    }
+
+    @IBAction func tapProgressOccur(_ sender : UITapGestureRecognizer){
+        for chart in progressViews{
+            chart.progressColor = sender.view?.backgroundColor ?? .red
+        }
     }
 }
 

CustomView/Views/ProgressBarView.swift

@@ -10,6 +10,27 @@ import UIKit
 
 @IBDesignable
 class ProgressBarView: UIView {
+    private var lblProgressPercentage:UILabel = UILabel(frame: CGRect(x: 15, y: 10, width: 60, height: 25))
+    private var lblTargetPercentage:UILabel = UILabel(frame: CGRect(x: 15, y: 35, width: 60, height: 25))
+    private func setPercentage(){
+        lblTargetPercentage.text = "\(String(format:"%.1f", targetValue * 100))%"
+        lblProgressPercentage.text = "\(String(format:"%.1f", progressValue/targetValue * 100))%"
+    }
+
+    @IBInspectable
+    var showPercentage:Bool = false{
+        didSet{
+            if showPercentage{
+                addSubview(lblProgressPercentage)
+                addSubview(lblTargetPercentage)
+            }
+            else{
+                lblProgressPercentage.removeFromSuperview()
+                lblTargetPercentage.removeFromSuperview()
+            }
+        }
+    }
+
     @IBInspectable
     var lineWidth:CGFloat = 10.0 {
         didSet{
@@ -20,23 +41,39 @@ class ProgressBarView: UIView {
     @IBInspectable
     var targetValue:CGFloat = 0.25 {
         didSet{
+            setPercentage()
             setNeedsDisplay()
         }
     }
 
     @IBInspectable
     var progressValue:CGFloat = 0.0 {
         didSet{
+            setPercentage()
             setNeedsDisplay()
         }
     }
 
     @IBInspectable
-    var lineColor:UIColor = UIColor.black
+    var lineColor:UIColor = UIColor.black{
+        didSet{
+            setNeedsDisplay()
+        }
+    }
+
     @IBInspectable
-    var targetColor:UIColor = UIColor.blue
+    var targetColor:UIColor = UIColor.blue{
+        didSet{
+            setNeedsDisplay()
+        }
+    }
+
     @IBInspectable
-    var progressColor:UIColor = UIColor.yellow
+    var progressColor:UIColor = UIColor.yellow{
+        didSet{
+            setNeedsDisplay()
+        }
+    }
 
 
     override func draw(_ rect: CGRect) {

CustomView/Views/ProgressCircleView.swift

@@ -13,11 +13,33 @@ import UIKit
 
 @IBDesignable
 class ProgressCircleView: UIView {
+    private var lblProgressPercentage:UILabel = UILabel(frame: CGRect(x: 15, y: 10, width: 60, height: 25))
+    private var lblTargetPercentage:UILabel = UILabel(frame: CGRect(x: 15, y: 35, width: 60, height: 25))
+    private func setPercentage(){
+        lblTargetPercentage.text = "\(String(format:"%.1f", targetValue * 100))%"
+        lblProgressPercentage.text = "\(String(format:"%.1f", progressValue/targetValue * 100))%"
+    }
+
+    @IBInspectable
+    var showPercentage:Bool = false{
+        didSet{
+            if showPercentage{
+                addSubview(lblProgressPercentage)
+                addSubview(lblTargetPercentage)
+            }
+            else{
+                lblProgressPercentage.removeFromSuperview()
+                lblTargetPercentage.removeFromSuperview()
+            }
+        }
+    }
+
 
     @IBInspectable
     // The value of current progress between 0.0 and 1.0
     var progressValue:CGFloat = 0.0 {
         didSet{
+            setPercentage()
             setNeedsDisplay()
         }
     }
@@ -26,6 +48,7 @@ class ProgressCircleView: UIView {
     // TargetValue is a value between 0.0 and 1.0 that represent the value to be archieved
     var targetValue:CGFloat = 0.75 {
         didSet{
+            setPercentage()
             setNeedsDisplay()
         }
     }
@@ -38,13 +61,25 @@ class ProgressCircleView: UIView {
     }
 
     @IBInspectable
-    var circleColor:UIColor = UIColor.black
+    var circleColor:UIColor = UIColor.black{
+        didSet{
+            setNeedsDisplay()
+        }
+    }
 
     @IBInspectable
-    var progressColor:UIColor = UIColor.yellow
+    var progressColor:UIColor = UIColor.yellow{
+        didSet{
+            setNeedsDisplay()
+        }
+    }
 
     @IBInspectable
-    var targetColor:UIColor = UIColor.green
+    var targetColor:UIColor = UIColor.green{
+        didSet{
+            setNeedsDisplay()
+        }
+    }
 
     // Method that draw the circle, progress and target
     override func draw(_ rect: CGRect) {