From 357e6df2ec47bbe5b4b649fabdd7ef8229d6a60b Mon Sep 17 00:00:00 2001 From: Casey Borders Date: Tue, 24 Feb 2015 14:22:26 -0500 Subject: [PATCH 1/7] Turn off drawing of check mark at the end --- .../FFCircularProgressView.xccheckout | 41 +++++++ .../UserInterfaceState.xcuserstate | Bin 0 -> 8630 bytes .../xcschemes/FFCircularProgressView.xcscheme | 110 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 27 +++++ .../FFCircularProgressView.h | 5 + .../FFCircularProgressView.m | 5 +- 6 files changed, 186 insertions(+), 2 deletions(-) create mode 100644 FFCircularProgressView.xcodeproj/project.xcworkspace/xcshareddata/FFCircularProgressView.xccheckout create mode 100644 FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/FFCircularProgressView.xcscheme create mode 100644 FFCircularProgressView.xcodeproj/xcuserdata/cborders.xcuserdatad/xcschemes/xcschememanagement.plist 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 0000000000000000000000000000000000000000..db4608c0d5132b50408e66bb44c8f4b7ccf127ad GIT binary patch literal 8630 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 literal 0 HcmV?d00001 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..d6612e8 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h @@ -47,6 +47,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..3c72ea8 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m @@ -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 { From a6545a5c714fb1f99afdfd7753eef64afe57c3eb Mon Sep 17 00:00:00 2001 From: Casey Borders Date: Tue, 24 Feb 2015 15:40:26 -0500 Subject: [PATCH 2/7] Tick color vs tint color --- .../UserInterfaceState.xcuserstate | Bin 8630 -> 11301 bytes .../FFCircularProgressView.h | 5 +++++ .../FFCircularProgressView.m | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate index db4608c0d5132b50408e66bb44c8f4b7ccf127ad..963d1265c5930a2ec6295c3fb48698937a8cfde2 100644 GIT binary patch delta 6073 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 diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.h index d6612e8..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 */ diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m index 3c72ea8..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 From c63121d76df67f2321c732b8683fb201d05b6c87 Mon Sep 17 00:00:00 2001 From: Casey Borders Date: Tue, 24 Feb 2015 15:48:14 -0500 Subject: [PATCH 3/7] Use color for right layer --- .../UserInterfaceState.xcuserstate | Bin 11301 -> 15454 bytes .../FFCircularProgressView.m | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate index 963d1265c5930a2ec6295c3fb48698937a8cfde2..2c3618526f28b54284979e431a0908482dbe4953 100644 GIT binary patch literal 15454 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 diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m index 86808d2..36e5c06 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m @@ -126,7 +126,7 @@ - (void)drawRect:(CGRect)rect if ([self progress] == 1.0) { if (!_hideCompletionIcon) [self drawTick]; - [_progressBackgroundLayer setFillColor:_progressLayer.strokeColor]; + [_progressBackgroundLayer setFillColor:_progressBackgroundLayer.strokeColor]; } else if (([self progress] > 0) && [self progress] < 1.0) { if (!_hideProgressIcons) From 37980316b77a6901d64fcaf47e5c79685bc5b53f Mon Sep 17 00:00:00 2001 From: Casey Borders Date: Tue, 24 Feb 2015 15:50:43 -0500 Subject: [PATCH 4/7] Should fill with progress color --- .../UserInterfaceState.xcuserstate | Bin 15454 -> 15453 bytes .../FFCircularProgressView.m | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate index 2c3618526f28b54284979e431a0908482dbe4953..54eba8f05717d0d277b834c41d57c488cb87ab60 100644 GIT binary patch delta 1352 zcmWN{d2kL_008icASI5;DEjtY``+$;@9n!G>*`uB%Mq%LS^Deq)c29K^=9ZG!q$hR8{@=`{Q?O>CL4-0ibEAgVyv+Ozq+K zA{CAB{81~$rba|XL@VkQMS`55R`0^%D@B*#$L-!RwrqD%Hxb@35DDVIP!JD>gOMNs zOa#eb8ki1dfW=@LNCjVml^_jl1xLXNP!1}<8Bht%fvZ{zt%KG{3)4Dld$j_sQoE{M z)2?ebwENm4?N99qYz4#MhfsqE5@Bd`em3`^jzupCyv)9@^;f|uY;_z?aJ|3mMgAQX&R zqmHN>0th0EC}PM(eiVT|LZ70~P%IjZ63}Qg7L7+KXeOGC=AsOgg|?t=XgiiT&=1Gq zp*S87$K&t>oP;Oii#OpcyajK=yYXI}hxg-y_z*6}$8jaTgB$S+{0hIuZ}3|Z zLfVp0(t&g$VZPA-s(!L&7PN88g*G>mFg&~WNfKaHf(v=5D;v2-N;f+o<>bSj-rXVBSn9$i3}(*RAQ z=`@38(Hy#i=F&Yhj~<};w3wFBDtdv|&`b0ht*5u>ZQ4v<>!G@?_t8h`WA#KmNuQ#p z>TC2&J+M_T)lchZ^>g}py+(haH|S6FM!iXI)?c$=)`qoZ?O7)l#t73HXC~{xda_6s z%?7eTYzT{EW7v2$fhDn}ES+Vrbu5$p!1l9)>@X`}CF~eG!OB?$yUA{|d+Y&w#GbNe z>;-$p!+2-jm4g6Bya(^eqj)dghsW?(9><6A;d~^Y#FP0np2BDGIeab8=G*vop38Uf z-8`RP=5Uu|nMS}!Gt!Ny*%i#l;b{4VZ_`{JSaTXv9|>@NMXr;L)lWsK}E2gq1CL?+54IawylX);C5l5^z( zxlk^W0l8l8m4))Otd~u8h^^b<_6&Qzy~JK+Z?LoNZFXRXz0=OK57>w7AMHZ>uKmX8 z;t*TrRYgFZQRh{Sx~ytd zow}*1- z;=N^FnwRNq_P+CWc?Y~guh=`|ReBe_D_*Tv=iT)ldyU>x@0s_)d*yHK5AnD4xA&L& RtNkr&{I#3=^(8Ip{s&f@vvdFe delta 1353 zcmWN{dsI(%008jOLTgFu81DVP?)Q7|{eADfU)}rbv5Mr_OgJ4HmUlv$%KMl#nO|g` z(2g^d!eUq+u{zRDXC05}XJxqE zZby)i;IPPVW@Lm!goX+d9$p?M754UiJ3eSFZvrEI-?C$)R6d9g_4kBJvC;%7PMRc5 zk>aH}Qj(M`EtFEFucXz|8p$KAld_}&sa!fERZBI}1*ulLB;AmE%l>kJ94HTz56Go* zt$ahiDc_QB%Maxz@}Kfk&<6wp2>^fq0WM$w3k(G|hycUE2rv@Ff|+18m;>g5`5v$U zd;wBGI#>eafXCop@E`02 zy`VSj3kSd&kcsbsLx8dzLAMeM-_z*6^$8agG##e9?zJ{A|3vR`K;C9@B zJ8>88@enWKP5P4eNq-VR0tp}n2_g;&CgCKKM3HC`L#B|=Nj#ZG7LbJ`l`JO9$O@7{ zGD#N6COIUJ>?FHM5!p|Q$zf7LD#$5PN3M`Ya+Ta9t>iAbN4m)y#ZRG1lrmMBq0Cki zmHEmVNJFg z(Qq0`$I!8KJdLH(=`5N+6Y1A9o956>G?)HF578s^7%ioh^dvn)t7#3rL+{ZC^bvhR zpV8;^C4J2T*+4d!$sUGS2n%BoY#57T(JY3=vWaXGo5JR@B$mul*dn%sZDjeZknLhc zY%kl#O4v2lqQ0y8sUd2FnxLksnQE4rt!`9v)h+5)HBT*2cd12cxmuxCs=uly)iY|f zdQQEl)~WSsgZfbO(x7H)qqLQpCtLebtI`^^yV`y2f%Zsi*E+OU`a8Op-beS*2k3$N zhx!m**12x#Lbvr(dYxXcH|UM7xvnLyWv&&jFI~4>k6m4^Zr5|y3)d^&n|t$q{5|f+ z{rO-{x!{rfV?LUX;bZxDKAFe!>3k+n;E6niuk!Fr{vFTf1$-yp&5QU!euN+6rTjQQ z!B6sYyq>r4+x&Ol#vk&>{BOhG0ETS@8(~I-G2DnYMj4}x7-PIK+ekF#8A(R6kzy<| zmKrOJmBuO~)7WerFv^VcMyt_f`k2%VGE>dvX1clF++yaNg{Eh>xyLLv51U8LpUpC} z&FrxTS;VreAj@rqTH)3(E6N&Y#aWZBcx$?qXwA2htrRQG+HRe-{<22_7%IyzHT?$Eq1HZ z%h8=UXSI{% 0) && [self progress] < 1.0) { if (!_hideProgressIcons) From 5c5c992a4b2e81b2913ae2a203a7d2a8eee5835a Mon Sep 17 00:00:00 2001 From: Casey Borders Date: Tue, 24 Feb 2015 15:53:28 -0500 Subject: [PATCH 5/7] Set fill color --- .../UserInterfaceState.xcuserstate | Bin 15453 -> 15449 bytes .../FFCircularProgressView.m | 1 + 2 files changed, 1 insertion(+) diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate index 54eba8f05717d0d277b834c41d57c488cb87ab60..cbda85be343dfb887e6c837b4ecc289556cc983a 100644 GIT binary patch delta 1322 zcmWm4c~DhV0Dy5oL_~)vHBsK#?m73~ch0>B?|mSfVI=4w1l8ayI1g$-Ew~JBf`{NQ@Hco1x}ldF`oKPL02~Mh!C(j=f+h@s7IeXn z;Kwiyj)aMD5}X33!c>?J=fj0C8|K07un_J<8XATY&}cLkjYCN&8Kt0^Xf?`4U!$!k z4{b+c2lxC?g^FXBUbk=~>)2_!*8C4!hF zgoKizB$7mvI5L5JN)pK=GKYLl(#U+Wh%6ziNe0OzStOg}xycSvM2g8iQbG=qGEzxS zl3H?!G?2^W8fhW7$Q{y2UMv0zR3ep$$`oaqlA_E~)+ig49Hl_1QqC(i%1=tY(x5z0 z+LR|syV9X_DzB**?Lqx$Z`zjzQU`?;Q-uzpHVvgi=?EH6N6`d2nYyRaWST-((kz-y zH_;sWEj>s}=@D8^J@f=UO{?iydXwIv_vi!qh(4vy=nMLa1+w>8e>RW}W!JFDqkLSTp-q^;d_eVQR8lO;J~LmEl_u=#p*G&QuU}ms3+9ZYPEV!tx;>$I<;QCuXbyLG);@qmTFnr z9<54i&~9mWwR_qFtxbEZz0}@l-MY8#tM}0Z_4oAw`aqrOn(ovM{iI&2*Xi|ogL8&+ zfpd{_iPOEzdENQY+2QPTK65^IzI6V>y?77all$`k-k(G6>T5gmrF0S#fK z8Hy$Ttd&B4d|PVjMCK8{ZifMyt_f_A?!(ZVFSHmKkb>n~~;7bF4YuOf)B( zDdsG5u9<44o7>DY=I`cnvrD@BNi20Kq?DG7kkK+m#>x?LjQm7Sl(S{JTp$ zcm3sh2m(PUco(<;1Q?ir0}Dvd8^nNE&>sv0$siS^flt5$FbPZspMq>KA1nm9U@`E5 zrC>S81NmSx*bU0SK~N5U0+rwxH~~(A)8H(q1{c6}a1Z4ul8i@5z0qjqjhLK+K39#4zvpuqdjOJ+K(#G5p)jSLM`YidX8SAcJvAdV{a!Mg1h4G zI20>96wkt|@H*_n8}LqCjQ8LYd;pi?6Sxka#}{z}Zp2sdpST%6z%95Hw-bL7K!QkT z(uH&1}$K-lvb~WBQanXQAwE z){})X$Rb!2i(&m(92>wASuz{OMzB$A0?TAsESpVb)7eV4ffceXtcY!AJ6H+3$Qt!G z^bkElkI~b;dXDbZm+5)>O1(f|qp#K1>zni~dXfI4UZGd&KkJ9|qxuQ`lzvvP)@$@y z{f^;p07Dq@#vCKh_|~X0>Wv%5E#tOv*Jw5#7|)DXroS0z2Akc?Q1czLml7b3b-JaX;gJJb-uPZ}Je{mG|Ttw|QUw zK2P9-coHANNAeUtmZ$P`p24&EJnrRR@eO)*5SrRcLLswpqp2UTeSgy;Wv4S?zWY8{3v0ZYw*| zj<);RarR()xINNNvB%mO_9Q#Y&bD)GpMBi^+kRrVOK%U!q$R_pl94i24v_IOK@O6` zzt4pduHL51{K((kx>alvNo_m5k!JbZ@E}kk+ji=tz;Oo~P`!)U# Di2t%R diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m index 86808d2..510485f 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m @@ -96,6 +96,7 @@ - (void)setTickColor:(UIColor *)tickColor { _tickColor = tickColor; _progressLayer.strokeColor = tickColor.CGColor; + _progressLayer.fillColor = tickColor.CGColor; } - (void)drawRect:(CGRect)rect From 4e9e73dc15d2cb0a475ecd512139e6d4c6944512 Mon Sep 17 00:00:00 2001 From: Casey Borders Date: Tue, 24 Feb 2015 16:02:04 -0500 Subject: [PATCH 6/7] Icon Layer --- .../UserInterfaceState.xcuserstate | Bin 15449 -> 15456 bytes .../FFCircularProgressView.m | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate index cbda85be343dfb887e6c837b4ecc289556cc983a..5ca7bd046bf90615857385a627ae607f62cea5e7 100644 GIT binary patch delta 1379 zcmWN|d2kL_008i)Mi6O`W?FCGweP*%@9pl3-A@FGD<-W9CWD5CxEgnph^v}Ge43(} zARQBT&`{JB#Fb8_>aH__NgNSZi8@l6!KkBJ|NZ{?UCq9gy$b+PU{zk$Qx zDEJ+m1gAl@7Nmt~;aV##LR+tuYG<{p+BNOEc2m2rJ<|Ttp1`Is5<-X}g$!EIfl<(f zei#S4!tSsKOoGGU2>2x&1;+&7I5+{O!x?ZEoDJu|TsRlbhj}m`u7+FSZnzijhrhsb zcoZIoC*Ub~23EjJ@D_Xs|3i&XV-$=+P&3pTX$T>Lbi|Q?+M)KS1L}l6MW3NW)CZ-Y zA!sNXj?z&k%0iP-K3a}eq9U{gD;(&7lW;#g04L*NcqC54qj3(-$Ax$)UXEAdBD?`_ z!kh6{ydCerW%w{Yi|^tF{0hIpZ%Gh&kA#vi5>8r?2og!6Nk1}`EF??GGO~hfB%8@r zQbKl;QgWPJB-P|HsUfxG2KkfJlgFfiJf%Sa8caiIGx`B-Nh4?^#nho5ZAaVFSlXF( zqwzG64x(Ss6gq^CqhHYsnnkD3X*7rC(s?wG=F{bLHC;=K=|;MlZlfi%j2@yD^dhaI zm*_QmgWjfh=yUp357&j>O&_ce)ko-Q`WSt-{=HtH2Uh6^^i%p7{hWS5uhJjr_4*UN zL4T@0*Wa=b)|`d0mMnrrGR6cmnPf4nBa3C7SufU`^<_ycl?`VjSsI(k@>o7w$O_oc zY%AN&cCu1d&JMC8>^M8YZm~P;9(%wZv1jZBd&S=HNd6HA90fS#F}x#><6U?+9?uhb z67SEG`5-=ukLBZeI-kfV@dbPZFXC%>F<;L&@DhHR*NP@0T*QbtF;ZlTTrp4Ni3OrS zEEY?|a>?}W#J!LQ1TlSR$Wr|Fd!{kVrCevkh zK<3IH{_2s4Z;I&akK2 zGwiwcVta*MWCzyT>+H?;HhYJ?%ie9*IYCYvhdEJ>=R`XloLHxe)6MDQ3~&ZIDNd@B z=8SR1JLyiQv&=c>{O!C{L8^^1Rh05nwCbR`s(6*4da7QkzxrGaR%2DBnxv+x=_*If zQQxWgDo-s|OH_#}SBKRxbt0fns|%`1T~;-!R@JF`^<4eyX1G~ywmaWltq5d#`OaB3XrN42Nzosy@3u#pQKRBJc`2YX_ delta 1365 zcmWm4d2kO`0KoBtAdX3u)Uo@neQ$Sv@9n5Qmy{?{mgvtEV{O+SW#5)VVfJfk~5+r zA|wfqiH=?}Cc_&OUfTQxbNmNY64>J1eLmEG1@vnBe|C)bD?IEy zUz8H3#4AIU1ZB7~Qb|!JDQU_SWtx(%ELJjWIgBq&tP>a;l>aXf$^@@5`y{kS@e^VcUKo9~x0G&ZspaKeXU;+*-5CNh<4Co04 zfjq@a2%WfrJxLy zgA3pqxDWmUe}gyREewFoU|SdpJHakcfdC?C!!YPTFZ>wxhJ9gwm;i^vk#H1Dg_Ge_ zI2~rg9JmhV!Hvj3zMg0x8ie9dJW51KC>f1I=_nh0jn<$Xv<~H=Eod7mL_5$fvTgX{4_{1`XjCLexF0!TB`inJ!}NC@dnbRvjN!bmuYB+;Y?=}U%^Pe}q9 zP9~5^B#lfZGsrBGPBKU)$s*Y#hioAEq=0NCg=8n$O^V53Qclj1Dsq8bCbi@`xk(zy zD=k=qTC_Gy8>x-flC>0Vp|(_8srlAxC0eOgrk&9$wJPnNRe6r;N&C=#bO0SlN6=9;i6+zeG>c}_<#Z+ej_#nl=w4bx{qzt$ zN{`bM^cuZMZ_|790ewQB(&zLg3t{b9N7l*5y0UJ}Wf819i)KAoUp9~pX7Ow&8_UMC zi7b^(Vbj<$mdoIM1_da>@;f6@=>NA=_SNxe)j*DLf&{jUDj=wcW~tTEg0Wf|WZB}SET-MD4kHtreq z#zW(U@!EK62AV-;TQkIb-wZW7nangyk7=2Q&2qECtTd}UV?EP6Gd#0Ab39i(_dN}s zM$c2vGtUdpKRkdp=Ph_JZ^Jus$UQugf5dz7KD-|vz=!YzK7uFmB%aJu`CK2*;9v1v zzMgO3`MiK{=ezh`Uc~qF1N;y_$t!pbzshg$I)0bm=YNPcqO-6>m~cgeh!Qtwxblz%#D&Qxcv<8xLxtDQ~G9;e9J?-V_mq3uJ?~y}tKAy6&VA@UcAvOU f-RJI0Z!>R@x23nWx5QiFZC>TAUf(+w2iE)t2~4ym diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m index 510485f..5e2bbdc 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m @@ -89,7 +89,7 @@ - (void)setTintColor:(UIColor *)tintColor { _tintColor = tintColor; _progressBackgroundLayer.strokeColor = tintColor.CGColor; - _iconLayer.strokeColor = tintColor.CGColor; + } - (void)setTickColor:(UIColor *)tickColor @@ -97,6 +97,7 @@ - (void)setTickColor:(UIColor *)tickColor _tickColor = tickColor; _progressLayer.strokeColor = tickColor.CGColor; _progressLayer.fillColor = tickColor.CGColor; + _iconLayer.strokeColor = tickColor.CGColor; } - (void)drawRect:(CGRect)rect From d5515bf51d7e4f5443a7a13e105e934c24e48769 Mon Sep 17 00:00:00 2001 From: Casey Borders Date: Tue, 24 Feb 2015 16:07:03 -0500 Subject: [PATCH 7/7] No need to set this --- .../UserInterfaceState.xcuserstate | Bin 15456 -> 15452 bytes .../FFCircularProgressView.m | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate b/FFCircularProgressView.xcodeproj/project.xcworkspace/xcuserdata/cborders.xcuserdatad/UserInterfaceState.xcuserstate index 5ca7bd046bf90615857385a627ae607f62cea5e7..1fb36e6aa45eca0d0cf095e4a4413e749f0653e2 100644 GIT binary patch delta 1297 zcmWN{X;4*F007_!kra(#a!KCV?m6e)ch0>B?|mR3goBx=!>Fm@f)I*gxS$v@ic35- z29?H11w{=_4Hq;R@-!Yy_K%BuHRjkT~}OJU3Xm%Tz|SAfo>oKybnSF00`*74J5EY7>EKf-~%uOB!Xm+ z0zL)PKsuNSW`Rtw2;_mKU^&PKE5IsH01Cktum@CuYH$er1Zu!9pbne>r@$Fd4=#Xf z;6C^l{0Ck`Kj`m;0q|Ye9}a*n2qA_V90(m44hO*x;YTn5j)X~Y5}X33!b~^^&V%z| zAuNWQU@6>+1R8=8(P%UljYG*O6{Vr+XbCDr-=Gbs7;QqOXeZi@%F$l5A00qGbQGOM zH&Hu!hF+kTs0+Qqf!Nyv2jSj07>8gRkH*<}4c>q^;u5?Im*c&-0w2VcxDKDg=kZ0{ zj9YLkzJuHFL)?x#a2N3-{v?3(B)v#52_d1xO%xeO91=;QNi2yY31kBKgd~wkWG4BH z%qH{502NxNj-rWlGWAZSsWgo)rUkT+uAxQrd%BnIrw3^zt)YkMF+oQtdwnKWo!rA$tu`I*23TBLEOWmc&eAr;rV{0ccXdDAr3*b?&(RC?@AO)|Nx!b&)Nkwe^fvvW{#<`$_!-@d zK;vB_#OP!6HwGAnAq>+9GmaSbMuX94G`Xj_v)l{Z3*Fu?+*jQ9-5u^u_Y?P1_jB=< z@E6_1J0eK*7X1Vfrid0p#V|2kj1Z&5c#$L~i)4{1(nO}n75U<8Q6e^rEn=G}6MMvd zaZpr>YH>&$7AHl6Xc1S%AL5p{EAETGWp5cO!=xi4WR#4NaWY;G^U4G{N~Xv(IbF_> z88TDOmGk97nIm&$zFaGJ%PM(Fw#p7O&?KfZXPepPB6Eeg&MYxY&28p(v)tTg9x#6} ztIS(wm(|xomb8>*Tj5ruHQ0)^Mp|R7@m7*G*-Eq0tqd#EnqzIWj$40OPpvNH?W?Gg zN-0}~s~8oh;?*!UT#Zp5tBGocnxnE*w#rdU)NeSb6$7?Jb|7b Uo?f0>PlKn)(_B0>4*RwI55ah)*#H0l delta 1309 zcmWN|dsL2R008i?7Gk-qnZD=tKF{;M-}AojllT29Ns^p46HW)iBGO7OtAsk%k$g_W zI-wmW6k#zem!e$S>8#^29oMv4E=$75TpH`7V`4V{{r>s2WZum@>gP8EjRjdB#%2Wv z21ybS65`69nH3NcXdiR=E$!hG=bxUGF>O&|a%5Uc+Op7stMB_2#5wyF{O0KPd>2zs z9BTw)yx-AL9&_v?k>=yBa9nZx?zrW+?YQH3jV?i{S1LlG+K_W;33&0|f3|4@ZU=>&ma=;p}4&;J7umcfv1t-E7I1A2( zaWEOC!Zf%P=D|X^4Hm3_EJwP3(8@)kqu?Oyny|KGL_Q3=3VC;(n@noEiH{dOJD=xzOa49~B%kU9g zfopLizJ_n$X54~X@t?RIKf@iklXwtM;zjz956A#AnD`PzOk$G&5=2IlQ6!v1kSH>P zd_iK!EV6)nMN&u_Sw=EQHpwAtNiNAFg>JHg>>?#(A1Nh=NExXjr%4@YBu(TxxkXyZ zJ#wFPk++JE!j*7krZQWZt0X8%$|~hsC12UD)F>B~%gR-yL1|JREA7g2r9R&I`cg_c)u^Du=?FTKj-un~1UiXE(^%?`qwzF>X3<=lM>o)X`XfC^57Q&G zf>zU0^enBV=jmN~pFX6I=~McGzNFps4fAC~m>+|Tu;FY33uR#}oJFuG7R{!xX>0~d zWb@fVmdqBjC2Tz_V#RDHD`9)sURK6#uonJ4_u<2ND35pZRG!1v@?5^2=krZ`GcV-Z z`A%NKPw*;U&41>n_*q`dFYwE}j@R=B{z&yyu`1O_b-9|W{-D;VP3k@Mf%;H=thTGq z)Yn>1%~R{Gd253-U+rVfp+U{iq&7@*X{WV1tzK);nw*KwCC+8e45#~R=WXW`XQ#8v z`O^8y`C7auyhLBoPxy#|!cTB9OpFqrh;d@Pm>?#J=^{qNia8=)B#2~@DRRVjqDX8P zJH#$gA`Xbd;)tja$Hhr;N?Z{2qD9;he~32mNIVh$=mT}6yYwJ^gdVDo)+6*teVkj5 z(kJP2^#pyMK3`v`C+my#rFw?GT+h^V^o{y{y;8rZx9XjSx4{kDNHNll6~-E4lTl<8 z8@r6%MyYYgC^wE8l}4NCVGcE^>2KO*pc!nAG{ekrbD}xboNmULv1WpqWG*z5%~W%% zdCvUXd?h`kd#Kc;zqDnb43?v1gp8EqzZ}bYPMReR=Zb(E$pfGN_(xHZ*R4~xA)kG>`J@JzGPpquh}>4X1m31v!B@= h_6z%^-EF^d^>KN-`nv|WYFzcMCRcMoSQzfn@;~#nsjdJ3 diff --git a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m index 5e2bbdc..86808d2 100644 --- a/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m +++ b/FFCircularProgressView/FFCircularProgressView/FFCircularProgressView.m @@ -89,15 +89,13 @@ - (void)setTintColor:(UIColor *)tintColor { _tintColor = tintColor; _progressBackgroundLayer.strokeColor = tintColor.CGColor; - + _iconLayer.strokeColor = tintColor.CGColor; } - (void)setTickColor:(UIColor *)tickColor { _tickColor = tickColor; _progressLayer.strokeColor = tickColor.CGColor; - _progressLayer.fillColor = tickColor.CGColor; - _iconLayer.strokeColor = tickColor.CGColor; } - (void)drawRect:(CGRect)rect