From 67a8b232b931eb97f8cd2eb5c39fffff60614288 Mon Sep 17 00:00:00 2001 From: Diego Waxemberg Date: Sat, 17 Oct 2015 16:16:13 -0700 Subject: [PATCH] added pull arrow to side of screen --- Limelight/Images.xcassets/Contents.json | 6 +++++ .../PullArrow.imageset/Contents.json | 23 ++++++++++++++++++ .../pull-arrow-light-14x31@1x.png | Bin 0 -> 901 bytes .../pull-arrow-light-28x61@2x.png | Bin 0 -> 812 bytes .../pull-arrow-light-42x92@3x.png | Bin 0 -> 1533 bytes .../ViewControllers/MainFrameViewController.m | 10 ++++++++ 6 files changed, 39 insertions(+) create mode 100644 Limelight/Images.xcassets/Contents.json create mode 100644 Limelight/Images.xcassets/PullArrow.imageset/Contents.json create mode 100644 Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-14x31@1x.png create mode 100644 Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-28x61@2x.png create mode 100644 Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-42x92@3x.png diff --git a/Limelight/Images.xcassets/Contents.json b/Limelight/Images.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Limelight/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Limelight/Images.xcassets/PullArrow.imageset/Contents.json b/Limelight/Images.xcassets/PullArrow.imageset/Contents.json new file mode 100644 index 0000000..3e235a1 --- /dev/null +++ b/Limelight/Images.xcassets/PullArrow.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "pull-arrow-light-14x31@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "pull-arrow-light-28x61@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "pull-arrow-light-42x92@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-14x31@1x.png b/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-14x31@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..6a3a11b478f1fb7933b5a87b54a03eb871b332d9 GIT binary patch literal 901 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM6!3HE{=IMI@DVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C-z_@Q5sCVBi)8VMc~o zb0ioT7$Y-7B1$5BeXNr6bM+Ea@{>~aDsl^esu>t;Dy)Fa+|-gpg^Jvqyke^gTP3gx zD1^l#~=$ z>Fbx5m+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxD?a#8ycOWDy)d+*y*DhOjBG80syc2lYWR`i6Q2`f#&>T5Uk0R{lkqsX&`S z=Gz(CfK{T1LG7{82U(8f7>G~7qCl_OaoOm@gUyc1=a70NFp#Htx;Tbd2wt6hHtSG; zKx=XGB3_A=9?Y6wWMg)2&=1(9|D^DjmR=1@_}fLS(?z%66^RiI7gIEOvj2IE&yFM$ zvu-DLmC1L0K07m4@@R@t<&{^u?JqYdcnaB{-Xy+w-b6trw;zkHX5I8CSU#U~Ria>= z-t2~uejpb2b$q+OX-5C8ZZEAGb6B?j zxZDHj``?q-gi9_~n;>6l-%<28SkCG1tu0L`swck zgBM2%Vm7FIGL*HD=yeVUyn~)Q~KaB0UHx3vIVCg!01bpqWdHyG literal 0 HcmV?d00001 diff --git a/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-28x61@2x.png b/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-28x61@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..383b416bcd9fe29b22f278360683b4f399ba78b5 GIT binary patch literal 812 zcmeAS@N?(olHy`uVBq!ia0vp^GC*w0!3HGv{pDl_QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiY77hwEes65fIG?WUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gb zC7EdmoAQdG-U511A0(r1sAr%LHyfzc1|(|bUzC{&v>9Z+ouLg_C5jl-9vgj-Impw+F(iWX?M&OeW(NVcTx}+A6V2G5Um{m5S-**9 zthoG)O^;XI!&5Twr$n@xNr1vXt|zkI5qa0nSR4-9%-iv|Om2@ON9J|UNj2-lq#j#n zY1}nA``&x^=HFKl}J-((}H@IkxA2Z(wU_FN`hE7v%_GY+}8p z=oMM&WEiOBb&~DLQbq0A(F$JAc_u!0)r`D(r^!56f#-1Zyw{&>{)c&eT_*GO*Jin2 zyKdNVG%bGrTW{+I&Hp?WYi|}h89Fd*cHHP-romd#e(2=tW-gXt^b}Xq@iLs|AsOg(sg*N2bd|ZE*6IV>a;KUqygBow_J8sp-y>g` jXE)le*rc=BqHnc!d_ks~cZTzQP(t-|^>bP0l+XkK!O$O= literal 0 HcmV?d00001 diff --git a/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-42x92@3x.png b/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-42x92@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e7019422d6b31e96175a31a391c49d48d5b28afe GIT binary patch literal 1533 zcmeAS@N?(olHy`uVBq!ia0vp^T0k7l!3HE*_lnyCDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C-z_@Q5sCVBi)8VMc~o zb0ioT7$Y-7B1$5BeXNr6bM+Ea@{>~aDsl^esu>t;Dy)Fa+|-gpg^Jvqyke^gTP3gx zD1^l#~=$ z>Fbx5m+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxD?a#8ycOWDy)d+*y*DhOjBG80syc2lYWR`i6Q2`f#&>T5Uk0R{lkqsX&`S z=Gz(CfK{T1LG7{82U(8f7>G~7qCl_OaoOm@gUyc1=a70NFw*!uT^vI)Sl`a}^}lT( zb8Pk!-}o0{w|Jw>)E0WqE{nLR_qd_!$o7ZE2QuXwjLY{O>AT#r#oJ%oV~XOnbso`) zi`QSc@cqrt#cnLDK_S+Pmvc@Qy}9;o^8NpYd2bbR^YiOJ*w#!^T)61At}diKmXQoeid1F|I6>%%;MtBFF6;obRSu?;0<%as>unfmMcv>QGK36wQ>6r z#Wf#PBzW9xbf@g$UZ|Lo&#ih$MeOJS;m!Z1O^BY=62L8VjLmV1;DV*Q6|x);-B9Q- zV%kz7?xO1#rC04cm|(Evtk#=IuN%D67}__jei`So@vXb`YN4qD?{;}8C3$bT zn)UVh^XH4by}k37FI%=~MR@VfJO4g@+{kuOi*xxKw@so|m6eta2OgX`<0IAdf?>g) z9XnREJ1tCF7?82RSM5+<$5zpl|?U;$@KYp(kg8-}2k5R>?j6{L{+oXo~dXV>7(O7CqzdJAdxnIz1hoJ-c@7 zc=5PZdY;+-!b{n4PAA#=H|}v0ta4vwU;M(orQ?yjj)3T&Ue_y?cmJE#>p3xQ?27#V z^2?VkEmL(GtiE6Eiqr^OrxdnANA2SJpp{o#f7rTj;V)AETJ`reHm8y{$M^J%JNIwjUd*ZD_~gjr-reH2FF5yH{LiM^vim}Y$tHnFJ+W?) zchc*n=T=PH=Jc{TgKc)2Ve4)iuJ79echvf|-mY1^ZQ-K)uV0K=ycfI8Rrr)6@@|jx zLo@EJs#4uYnSR{6dF$@oza9Fg7v^oh?Ret+gkO0rzwbGH)M@XTFTZ#0+_~>(Tx4GJ z&`8cDaAIoJq+>P{E??i~l4*2szEE9P%N#MIyqf6#zSnP_y>`;bztyxt;nZw~_a9r_ zSp)B}RP?LcXmxy2J5X)&Fwk*|Ipe*@oc&yj_HcfX^RM`_U!^P8?_`;GyZKbk zrK)Z%b`dgnU*0%tdF!J&Q_qFpwm7)1B1*$-;>&}rZ2!J)dg8fo%jMn;+5)Q@p5@E% zKeaKRd1CsB*e6mh^Bg|^J9ez?yOY0(VWSmCrDXKSn_IVTm0$7uAJfwZi$Cb(?^y^c OWIbK|T-G@yGywpCe}{Jf literal 0 HcmV?d00001 diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m index 0a7f978..a42640c 100644 --- a/Limelight/ViewControllers/MainFrameViewController.m +++ b/Limelight/ViewControllers/MainFrameViewController.m @@ -506,6 +506,16 @@ static NSMutableSet* hostList; [hostScrollView setShowsHorizontalScrollIndicator:NO]; hostScrollView.delaysContentTouches = NO; + UIButton* pullArrow = [[UIButton alloc] init]; + [pullArrow setImage:[UIImage imageNamed:@"PullArrow"] forState:UIControlStateNormal]; + [pullArrow sizeToFit]; + pullArrow.frame = CGRectMake(0, + self.collectionView.frame.size.height / 2 - pullArrow.frame.size.height / 2 - self.navigationController.navigationBar.frame.size.height, + pullArrow.frame.size.width, + pullArrow.frame.size.height); + [self.view addSubview:pullArrow]; + + self.collectionView.delaysContentTouches = NO; [self retrieveSavedHosts];