diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/.DS_Store differ
diff --git a/CustomView.xcodeproj/project.pbxproj b/CustomView.xcodeproj/project.pbxproj
old mode 100644
new mode 100755
diff --git a/CustomView.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CustomView.xcodeproj/project.xcworkspace/contents.xcworkspacedata
old mode 100644
new mode 100755
diff --git a/CustomView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CustomView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
old mode 100644
new mode 100755
diff --git a/CustomView.xcodeproj/project.xcworkspace/xcuserdata/joaquim.xcuserdatad/UserInterfaceState.xcuserstate b/CustomView.xcodeproj/project.xcworkspace/xcuserdata/joaquim.xcuserdatad/UserInterfaceState.xcuserstate
old mode 100644
new mode 100755
diff --git a/CustomView.xcodeproj/project.xcworkspace/xcuserdata/juvigato.xcuserdatad/UserInterfaceState.xcuserstate b/CustomView.xcodeproj/project.xcworkspace/xcuserdata/juvigato.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..b0e2f37
Binary files /dev/null and b/CustomView.xcodeproj/project.xcworkspace/xcuserdata/juvigato.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/CustomView.xcodeproj/xcuserdata/joaquim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/CustomView.xcodeproj/xcuserdata/joaquim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
old mode 100644
new mode 100755
diff --git a/CustomView.xcodeproj/xcuserdata/joaquim.xcuserdatad/xcschemes/xcschememanagement.plist b/CustomView.xcodeproj/xcuserdata/joaquim.xcuserdatad/xcschemes/xcschememanagement.plist
old mode 100644
new mode 100755
diff --git a/CustomView.xcodeproj/xcuserdata/juvigato.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/CustomView.xcodeproj/xcuserdata/juvigato.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..c0955fd
--- /dev/null
+++ b/CustomView.xcodeproj/xcuserdata/juvigato.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/CustomView.xcodeproj/xcuserdata/juvigato.xcuserdatad/xcschemes/xcschememanagement.plist b/CustomView.xcodeproj/xcuserdata/juvigato.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..2a99e1a
--- /dev/null
+++ b/CustomView.xcodeproj/xcuserdata/juvigato.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+
+
+
+
+ SchemeUserState
+
+ CustomView.xcscheme_^#shared#^_
+
+ orderHint
+ 0
+
+
+
+
diff --git a/CustomView/AppDelegate.swift b/CustomView/AppDelegate.swift
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/Contents.json b/CustomView/Assets.xcassets/Contents.json
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/cicle.imageset/Contents.json b/CustomView/Assets.xcassets/cicle.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/cicle.imageset/cicle-1.pdf b/CustomView/Assets.xcassets/cicle.imageset/cicle-1.pdf
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/cicleSelected.imageset/Contents.json b/CustomView/Assets.xcassets/cicleSelected.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/cicleSelected.imageset/cicleSelected-1.pdf b/CustomView/Assets.xcassets/cicleSelected.imageset/cicleSelected-1.pdf
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/line.imageset/Contents.json b/CustomView/Assets.xcassets/line.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/line.imageset/line-1.png b/CustomView/Assets.xcassets/line.imageset/line-1.png
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/lineSelected.imageset/Contents.json b/CustomView/Assets.xcassets/lineSelected.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/CustomView/Assets.xcassets/lineSelected.imageset/lineSelected.png b/CustomView/Assets.xcassets/lineSelected.imageset/lineSelected.png
old mode 100644
new mode 100755
diff --git a/CustomView/Base.lproj/LaunchScreen.storyboard b/CustomView/Base.lproj/LaunchScreen.storyboard
old mode 100644
new mode 100755
diff --git a/CustomView/Base.lproj/Main.storyboard b/CustomView/Base.lproj/Main.storyboard
old mode 100644
new mode 100755
index 4b8cb5b..ca0793a
--- a/CustomView/Base.lproj/Main.storyboard
+++ b/CustomView/Base.lproj/Main.storyboard
@@ -55,6 +55,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -67,7 +121,7 @@
-
+
@@ -206,6 +260,8 @@
+
+
@@ -213,7 +269,7 @@
-
+
diff --git a/CustomView/Controllers/ProgressBarViewController.swift b/CustomView/Controllers/ProgressBarViewController.swift
old mode 100644
new mode 100755
diff --git a/CustomView/Controllers/ProgressCircleViewController.swift b/CustomView/Controllers/ProgressCircleViewController.swift
old mode 100644
new mode 100755
index 266ef60..d96a21f
--- a/CustomView/Controllers/ProgressCircleViewController.swift
+++ b/CustomView/Controllers/ProgressCircleViewController.swift
@@ -11,6 +11,13 @@ import UIKit
class ProgressCircleViewController: UITableViewController {
@IBOutlet weak var progressCircleView: ProgressCircleView?
+
+
+ @IBOutlet weak var progressCircleViewMedium: ProgressCircleView!
+
+ @IBOutlet weak var progressCircleViewSmall: ProgressCircleView?
+
+
@IBOutlet weak var widthSlider: UISlider!
@IBOutlet weak var progressSlider: UISlider!
@IBOutlet weak var targetSlider: UISlider!
@@ -18,27 +25,52 @@ class ProgressCircleViewController: UITableViewController {
override func viewDidLoad() {
super.viewDidLoad()
+ //circulo maior
+
self.progressCircleView?.circleWidth = CGFloat(self.widthSlider.value)
self.progressCircleView?.progressValue = CGFloat(self.progressSlider.value)
self.progressCircleView?.targetValue = CGFloat(self.targetSlider.value)
+
+ //circulo medio
+ self.progressCircleViewMedium?.circleWidth = CGFloat(self.widthSlider.value)
+ self.progressCircleViewMedium?.progressValue = CGFloat(self.progressSlider.value)
+ self.progressCircleViewMedium?.targetValue = CGFloat(self.targetSlider.value)
+
+ //circulo pequeno
+ self.progressCircleViewSmall?.circleWidth = CGFloat(self.widthSlider.value)
+
+ self.progressCircleViewSmall?.progressValue = CGFloat(self.progressSlider.value)
+
+ self.progressCircleViewSmall?.targetValue = CGFloat(self.targetSlider.value)
}
override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
super.viewWillTransition(to: size, with: coordinator)
self.progressCircleView?.setNeedsDisplay()
+ self.progressCircleViewMedium?.setNeedsDisplay()
+
+ self.progressCircleViewSmall?.setNeedsDisplay()
}
@IBAction func widthChange(_ sender: Any) {
self.progressCircleView?.circleWidth = CGFloat(self.widthSlider.value)
+ self.progressCircleViewMedium?.circleWidth = CGFloat(self.widthSlider.value)
+
+ self.progressCircleViewSmall?.circleWidth = CGFloat(self.widthSlider.value)
}
@IBAction func progessChange(_ sender: Any) {
self.progressCircleView?.progressValue = CGFloat(self.progressSlider.value)
+ self.progressCircleViewMedium?.progressValue = CGFloat(self.progressSlider.value)
+ self.progressCircleViewSmall?.progressValue = CGFloat(self.progressSlider.value)
}
@IBAction func targetChange(_ sender: Any) {
self.progressCircleView?.targetValue = CGFloat(self.targetSlider.value)
+ self.progressCircleViewMedium?.targetValue = CGFloat(self.targetSlider.value)
+
+ self.progressCircleViewSmall?.targetValue = CGFloat(self.targetSlider.value)
}
}
diff --git a/CustomView/Info.plist b/CustomView/Info.plist
old mode 100644
new mode 100755
diff --git a/CustomView/Views/ProgressBarView.swift b/CustomView/Views/ProgressBarView.swift
old mode 100644
new mode 100755
diff --git a/CustomView/Views/ProgressCircleView.swift b/CustomView/Views/ProgressCircleView.swift
old mode 100644
new mode 100755