From d9852b372ccf1e4c6fb42e47d2c1487ebea88da3 Mon Sep 17 00:00:00 2001 From: Sebastien Windal Date: Wed, 5 Mar 2014 22:09:19 -0500 Subject: [PATCH] more button types: left and right carets, left and right arrows. --- .gitignore | 8 +++ FRDLivelyButton.podspec | 2 +- .../UserInterfaceState.xcuserstate | Bin 12126 -> 19280 bytes .../FRDLivelyButtonDemo/FRDLivelyButton.h | 6 ++- .../FRDLivelyButtonDemo/FRDLivelyButton.m | 42 ++++++++++++++++ .../FRDLivelyButtonDemo/Storyboard.storyboard | 46 +++++++++++++++++- .../FRDLivelyButtonDemo/TestViewController.m | 10 +++- 7 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f2a21a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ + +FRDLivelyButtonDemo/FRDLivelyButtonDemo.xcodeproj/project.xcworkspace/xcshareddata/FRDLivelyButtonDemo.xccheckout + +FRDLivelyButtonDemo/FRDLivelyButtonDemo.xcodeproj/project.xcworkspace/xcuserdata/sebastienwindal.xcuserdatad/WorkspaceSettings.xcsettings + +FRDLivelyButtonDemo/FRDLivelyButtonDemo.xcodeproj/project.xcworkspace/xcuserdata/sebastienwindal.xcuserdatad/UserInterfaceState.xcuserstate + +*.xcuserstate diff --git a/FRDLivelyButton.podspec b/FRDLivelyButton.podspec index da61e86..418e2d2 100644 --- a/FRDLivelyButton.podspec +++ b/FRDLivelyButton.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "FRDLivelyButton" - s.version = "1.0.1" + s.version = "1.1.0" s.summary = "Lively button." s.description = "Simple UIButton subclass intended to be used inside a UIBarButtonItem. Supports common nav bar button types, nicely animates button type changes and touch events." s.homepage = "http://github.com/sebastienwindal/FRDLivelyButton" diff --git a/FRDLivelyButtonDemo/FRDLivelyButtonDemo.xcodeproj/project.xcworkspace/xcuserdata/sebastienwindal.xcuserdatad/UserInterfaceState.xcuserstate b/FRDLivelyButtonDemo/FRDLivelyButtonDemo.xcodeproj/project.xcworkspace/xcuserdata/sebastienwindal.xcuserdatad/UserInterfaceState.xcuserstate index 14214b6f4d9fc8962162e25909e1d0f53d5196f7..21a472ad07ecf370e2d147e6f668b5616c104d83 100644 GIT binary patch literal 19280 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 delta 6694 zcmZ`-2Y6IP*Pb)8?QY4IyL~s?!frwgApue#lmH1uigZXQA!P}H6bK=JA?z%@8NpRR zdJ4S@(nJ9PTM!TsL6jyUprZ02V*C7OH-z#%{_t$}?woVaoHO&j@0@$jEP*Q{7U=}! zBDoZ(O7;kLs3ClD=XSm<1YO;jpm`n=rt5TwWtoQL+jB7 zv=MDWJJ3$F7wtob(GheMeT+UqXV7`{Il7Flqwmm<=pK52{s0UFWFQAE=s*t!Xa=#+ z9O57zT0l!^1qqM{ZJ`}>_CXr-hL@lZ^o4-9Od=r0*Z{hFo5BO*N7eNGw&__f>N@PSyRK!ZciH+FF3nYd#BeA3nNg-`XJJOxJ zNP3W-WB?gR29d#J2pK`L$Vf7Vj3tGnh?J3O#78Lclj&pznMtb1t7H*bOjeMUWEH6< z>&V+=FWE=-lLO=+d5;_=?~`NXLvos&BXB-&m9!JkozxR>3aTJ__fCNsRQigF7I86- zxXKtuMSQEcxWFahQiYAaK)X;YeTnv=(ScO4#i8n+mfnAK$)w)du<-W`rZ|+3#?+wEsDL_YByD=`v2!6RL7Ey=go>$)M%18jXgqB~-K>Hnqtn+X zBGumq1^=BzNhldjMpK6M?w?kWTUJm~oLxGlhK-~&hN?i*{wEY=p`xfKBDKWvOpuvq z)`;Hydrd6M&MEYEEG^BRQj2Dy)+nW6jyY&A=1(OD{We{Z2Tx6GUOWHGZ;j=;}mL!j8qb!<%db+iIStw(R5C1@#H zhTcTWX>%G!<7o@plD1lpRw5T#%|2^UHBF!@+MazvZGwd=yYx%zSy1jRoYHAxSy@SOV}McVTzX#Yh2eGX}z0Z~2e9z@!>)DY4h=L7-}Kj+yMIBKRn zf}RVg=Q&pesGfBNHE3ur+MDfRWTXx91HZ)fevsC&gT<=wq=gsP0mMtvK%P!3eNF|j`G7Gb(luRreQ0nzI)|&*a*-}C>9a;@- z=rD$~1?s4-jn?*%8nkwx!>geq9YLc9^vW)1#0;cEcciI>F3=Ua(JVTWX4k@tEa#py zhvhkwEyP=j>;cdZB~(LynoE_9VF$qo6tw{c!w|@TOc)BoU^vaAUOI~A)6ukmj@bZN zFcPvM2i<`@@Y1ogkd{$O)2W|MXG!LVz14IaOhlSG7!Rc|0m^6*Ev6-OTpg6dB;vm;p193}(S> zm;-ZR9?VDG1Jk*F+*DdleRLwV1it2yT0s>`sD)Qy5iF*Y=oI=gRi1^{nS|bfC7Ipx zyv1b&qYAvGEX~OwZGvU+W?-b$A%Nv5g!Fyp1`%ytB2k9Gg4r)jB5B-QhCwFpya2B5K79SN#lAeeexRSo;*Lx8Qb=1K-its!@05$#|#k zTv9xtq|n=?ps>ta8cab2jg#GjpBuFaexYwX)+Tts4paCQ9?~Ur*%MuY-{G(4B;+{! zH@FN-gK|?rpH&--vG6(96Ijfa>&=koxaT}&Sl*!6k5j@*tZqyRYv{_yDPbK;3G1TnmvOxzWB!`rhM6HchG_aM?{GiHyUh)}>+>A% z8W{FmVmOnf)(#DW4QLqM#xmbd*}2G?C!EF5j$5)ylp$W=T%4DsiVXE$4uw?Sn}MSS zdr`_WgMpKBPK@*M=qy!4qobq-7X+Oe2h_vxSX_>xHseBEgo|+r9*4){Qak~d;fZt? zeT(jQFr_@uE0}qC7#CM?P5p9I}EbF(1-MQKN$UBVqjO% z=-rkmDVXsqcoFLpa24dyL)2e`7vtCHyYwRC!QrMI-FOLJ#&Cm|()X(IoAd}fpPvc@ zUL6vH!vSTB;%Hor*E5FU8eEI(@H%>wzE6+Q<8^og-iSBh&GZC4Nk64uu)sT79O#O7 z;ZS=MJiqZC`avTg_XPpDA0MC}(odcO@(@1!9O91Pqx2*CF~j4YmaWYA1N`x`W;71h zvnH~hnMtdNSbQe9J)hB2RCyksXTr+l6@QK|;4kpSj0vHhk0~VmjGm#V=>=9yesn~~ z{qJr%9e4caM*4h(uLf7?YkY;CrRQq!HGG|(r=PQ8X19u9s%;drP8Z+CcLJAMIfS+N zF8)67MXL_I@sIf4^F;gwKMXF@ef%H%0RKua(aZE}dbJM!h9BYI@gMX${g&RLKR&lG_*dO&&|#hWCXjx_=M!7${`i4TQF@;Xlw?FgSh`S zn1@8NU`^>Q`W*{)n+5C3R+}BoJ39S;M{{F-%}J|&4Vgd^S;%C1mwwMe{=jy{86V*z z?Mdf zf@BjfimD|!B$wpTKj@$IuUaySi-nN0uj1M&mZl9x#Znd%4Z2jT}oFg;J8Z;CD8O?o+!%p&vt<(Bzm z0a@q=ksriO$eVtU`a$LgIa|LDKZisf)p1cJr7*j{vGkDKKMWmEcj10zzF z`N%sgqeJA~U`rEhqk;_IvUFxdo*#4#=^Z9V8Zz(@S+Xr1|7H8dHrF6w{^+zdu4_){&3#ulPPWi68jEOs~>Qey}ojH$4Zsr^GuO zB%U8E&v5oBE%6s2TAmIZZO{A2m*nz5*1eZ`DIf_lF*SbyC7?E_1Jm{ycoAO4w01Ll z<-xR+Y34zE2*1Z(aQsC$VrK6$Y>a{~(u8^T_Ai5~JF1joFU5vz>*e>>nTZ)s#ZNzQG9mSo+>Ef>9q2g)c1>$Am z<>Hm%)#A0{8gZR?mw31MZSg+w0r5NHcg2Ur7sP)^no7D!21^Pg<&r6q3duAHl}wks zE~%E(N!Cj?Nw!F~NsdW;XC$9XzK~p!T#;Op+>qRqd@K2rlW+=7$*DO#XXMPBm5b$4 zxb|Es*O^P_x^e@!f!rW&2v@>Q<$Ro`KR)4Dn(CqIA9b|4xjIvwuU@2HrCz7@?NaYnzpdVKnh1?s6RBycX`yMW>8i=n6lx}FCTXT< zDm0av*_yeU`I?2AD$OFzc1^wJ9xvuqyqf2E2Oq(^`6xb`kKt4KPW(%JKYjo|n9tyc z@_BrLj~~ky@g@9J-p|kAXYup-g?tsih<}q`&u`(k@jLiE{9b-Pe~>@MpW#2_&+_N_ z>-a+%}Rcq5av@UIoHbL7-+g00L+e6z&+fO?{ zJ4icPJ6=0oyHvYNds2H!dq#U!>pQRgQTtH)w~o`r=#q79bZvF*b*Z|6y1}{(-B8_d zU6yXNu0%IpH$gX1H%Uiz({(d-ujpRYE!Hj9t<|89n+oAeW<&pyP>cRDVH#QU9g>EBzJyHT@0!P5mvO{q7`%q5hIxiVhEs++Mq)G@BaJb}SYwvv zG)_0pGR`s1H!d_*8CMur8P^!AO%jvNWHUKTE>jbe$JE>uZ)#~uFeRBLaJYnru-wVU-t>tJh!b*Oc? zwcdKs`lay_}A!iR;A2p<`q6Mi!MQuyWYufwm}df75A-geFQgY9=awhQbcyH8@5 z+IhRqZm^r|7JIneV~?}9ws*0=WbbS5Zy#tMY#(XQvFF)G*+<*Q*eBTi_67E3_Eq*Z z_G + + + + @@ -111,8 +151,12 @@ + + + + diff --git a/FRDLivelyButtonDemo/FRDLivelyButtonDemo/TestViewController.m b/FRDLivelyButtonDemo/FRDLivelyButtonDemo/TestViewController.m index 75eb75a..f86d162 100644 --- a/FRDLivelyButtonDemo/FRDLivelyButtonDemo/TestViewController.m +++ b/FRDLivelyButtonDemo/FRDLivelyButtonDemo/TestViewController.m @@ -20,6 +20,10 @@ @interface TestViewController () @property (weak, nonatomic) IBOutlet FRDLivelyButton *closeCircleButton; @property (weak, nonatomic) IBOutlet FRDLivelyButton *upCaretButton; @property (weak, nonatomic) IBOutlet FRDLivelyButton *downCaretButton; +@property (weak, nonatomic) IBOutlet FRDLivelyButton *leftCaretButton; +@property (weak, nonatomic) IBOutlet FRDLivelyButton *rightCaretButton; +@property (weak, nonatomic) IBOutlet FRDLivelyButton *leftArrowButton; +@property (weak, nonatomic) IBOutlet FRDLivelyButton *rightArrowButton; @end @@ -49,6 +53,10 @@ - (void)viewDidLoad [self.closeCircleButton setStyle:kFRDLivelyButtonStyleCircleClose animated:NO]; [self.upCaretButton setStyle:kFRDLivelyButtonStyleCaretUp animated:NO]; [self.downCaretButton setStyle:kFRDLivelyButtonStyleCaretDown animated:NO]; + [self.leftCaretButton setStyle:kFRDLivelyButtonStyleCaretLeft animated:NO]; + [self.rightCaretButton setStyle:kFRDLivelyButtonStyleCaretRight animated:NO]; + [self.leftArrowButton setStyle:kFRDLivelyButtonStyleArrowLeft animated:NO]; + [self.rightArrowButton setStyle:kFRDLivelyButtonStyleArrowRight animated:NO]; [self.bigButton setStyle:kFRDLivelyButtonStyleClose animated:YES]; [self.bigButton setOptions:@{kFRDLivelyButtonLineWidth: @(4.0f)}]; @@ -78,7 +86,7 @@ - (IBAction)changeButtonStyleAction:(FRDLivelyButton *)sender - (IBAction)buttonAction:(FRDLivelyButton *)sender { - newStyle = (newStyle + 1) % 7; + newStyle = (newStyle + 1) % 11; [sender setStyle:newStyle animated:YES]; }