Skip to content

Turn off drawing of check mark at the end #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CaseyB wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Turn off drawing of check mark at the end #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
357e6df
Turn off drawing of check mark at the end
Feb 24, 2015
a6545a5
Tick color vs tint color
Feb 24, 2015
c63121d
Use color for right layer
Feb 24, 2015
3798031
Should fill with progress color
Feb 24, 2015
5c5c992
Set fill color
Feb 24, 2015
4e9e73d
Icon Layer
Feb 24, 2015
d5515bf
No need to set this
Feb 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions ...ProgressView.xcodeproj/project.xcworkspace/xcshareddata/FFCircularProgressView.xccheckout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>BFCEF3C4-754D-4C0A-9746-2F5222F2D964</string>
<key>IDESourceControlProjectName</key>
<string>FFCircularProgressView</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>719AA8A1976C16731FBE34366E831E350F658FBD</key>
<string>https://github.com/CaseyB/FFCircularProgressView.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>FFCircularProgressView.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>719AA8A1976C16731FBE34366E831E350F658FBD</key>
<string>../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/CaseyB/FFCircularProgressView.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>719AA8A1976C16731FBE34366E831E350F658FBD</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>719AA8A1976C16731FBE34366E831E350F658FBD</string>
<key>IDESourceControlWCCName</key>
<string>FFCircularProgressView</string>
</dict>
</array>
</dict>
</plist>
Binary file added ...deproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
110 changes: 110 additions & 0 deletions ...sView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/FFCircularProgressView.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BD8ACEA179535F80032D47A"
BuildableName = "FFCircularProgressView.app"
BlueprintName = "FFCircularProgressView"
ReferencedContainer = "container:FFCircularProgressView.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BD8AD05179535F80032D47A"
BuildableName = "FFCircularProgressViewTests.xctest"
BlueprintName = "FFCircularProgressViewTests"
ReferencedContainer = "container:FFCircularProgressView.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BD8AD05179535F80032D47A"
BuildableName = "FFCircularProgressViewTests.xctest"
BlueprintName = "FFCircularProgressViewTests"
ReferencedContainer = "container:FFCircularProgressView.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BD8ACEA179535F80032D47A"
BuildableName = "FFCircularProgressView.app"
BlueprintName = "FFCircularProgressView"
ReferencedContainer = "container:FFCircularProgressView.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BD8ACEA179535F80032D47A"
BuildableName = "FFCircularProgressView.app"
BlueprintName = "FFCircularProgressView"
ReferencedContainer = "container:FFCircularProgressView.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BD8ACEA179535F80032D47A"
BuildableName = "FFCircularProgressView.app"
BlueprintName = "FFCircularProgressView"
ReferencedContainer = "container:FFCircularProgressView.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
27 changes: 27 additions & 0 deletions ...ProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?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>FFCircularProgressView.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>2BD8ACEA179535F80032D47A</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>2BD8AD05179535F80032D47A</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
10 changes: 10 additions & 0 deletions FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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.
*/
Expand Down
7 changes: 4 additions & 3 deletions FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -211,7 +213,6 @@ - (void) drawTick {

[_iconLayer setPath:tickPath.CGPath];
[_iconLayer setFillColor:self.tickColor.CGColor];
[_progressBackgroundLayer setFillColor:_progressLayer.strokeColor];
}

- (void) drawStop {
Expand Down