diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcshareddata/FFCircularProgressView.xccheckout b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcshareddata/FFCircularProgressView.xccheckout new file mode 100644 index 0000000..52bc641 --- /dev/null +++ b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcshareddata/FFCircularProgressView.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + BFCEF3C4-754D-4C0A-9746-2F5222F2D964 + IDESourceControlProjectName + FFCircularProgressView + IDESourceControlProjectOriginsDictionary + + 719AA8A1976C16731FBE34366E831E350F658FBD + https://github.com/CaseyB/FFCircularProgressView.git + + IDESourceControlProjectPath + FFCircularProgressView.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 719AA8A1976C16731FBE34366E831E350F658FBD + ../.. + + IDESourceControlProjectURL + https://github.com/CaseyB/FFCircularProgressView.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 719AA8A1976C16731FBE34366E831E350F658FBD + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 719AA8A1976C16731FBE34366E831E350F658FBD + IDESourceControlWCCName + FFCircularProgressView + + + + diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..1fb36e6 Binary files /dev/null and b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/FFCircularProgressView.xcscheme b/FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/FFCircularProgressView.xcscheme new file mode 100644 index 0000000..542cfda --- /dev/null +++ b/FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/FFCircularProgressView.xcscheme @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/xcschememanagement.plist b/FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..fdba968 --- /dev/null +++ b/FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + FFCircularProgressView.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 2BD8ACEA179535F80032D47A + + primary + + + 2BD8AD05179535F80032D47A + + primary + + + + + diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h index 25dd443..b6c5d85 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h @@ -32,6 +32,11 @@ */ @property (nonatomic, strong) UIColor *tickColor; +/** + * The color of the initial circle + */ +@property (nonatomic, strong) UIColor *startColor; + /** * Icon view to be rendered instead of default arrow */ @@ -47,6 +52,11 @@ */ @property (readwrite) BOOL hideProgressIcons; +/** + * You can hide the tick mark which is shown upon completion + */ +@property (readwrite) BOOL hideCompletionIcon; + /** * Make the background layer to spin around its center. This should be called in the main thread. */ diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m index 38fede8..86808d2 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m @@ -89,13 +89,13 @@ - (void)setTintColor:(UIColor *)tintColor { _tintColor = tintColor; _progressBackgroundLayer.strokeColor = tintColor.CGColor; - _progressLayer.strokeColor = tintColor.CGColor; _iconLayer.strokeColor = tintColor.CGColor; } - (void)setTickColor:(UIColor *)tickColor { _tickColor = tickColor; + _progressLayer.strokeColor = tickColor.CGColor; } - (void)drawRect:(CGRect)rect @@ -124,7 +124,9 @@ - (void)drawRect:(CGRect)rect [_progressLayer setPath:processPath.CGPath]; if ([self progress] == 1.0) { - [self drawTick]; + if (!_hideCompletionIcon) + [self drawTick]; + [_progressBackgroundLayer setFillColor:_progressLayer.strokeColor]; } else if (([self progress] > 0) && [self progress] < 1.0) { if (!_hideProgressIcons) @@ -211,7 +213,6 @@ - (void) drawTick { [_iconLayer setPath:tickPath.CGPath]; [_iconLayer setFillColor:self.tickColor.CGColor]; - [_progressBackgroundLayer setFillColor:_progressLayer.strokeColor]; } - (void) drawStop {