From 7e21b131ac7d76fdd20a801f86ad893abe909595 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 30 Aug 2019 21:15:11 -0700 Subject: [PATCH] Redesign navigation bar on iOS --- .../Images.xcassets/Logo.imageset/logo.png | Bin 6338 -> 0 bytes .../pull-arrow-light-14x31@1x.png | Bin 901 -> 0 bytes .../pull-arrow-light-28x61@2x.png | Bin 812 -> 0 bytes .../pull-arrow-light-42x92@3x.png | Bin 1533 -> 0 bytes .../Contents.json | 2 +- .../SettingsButton.imageset/settings.pdf | 70 +++++++++++++++++ .../Contents.json | 4 +- .../UpIcon.imageset/up_arrow.pdf | 70 +++++++++++++++++ .../ViewControllers/MainFrameViewController.h | 4 +- .../ViewControllers/MainFrameViewController.m | 72 +++++------------- iPad.storyboard | 16 +--- iPhone.storyboard | 24 ++---- 12 files changed, 174 insertions(+), 88 deletions(-) delete mode 100644 Limelight/Images.xcassets/Logo.imageset/logo.png delete mode 100644 Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-14x31@1x.png delete mode 100644 Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-28x61@2x.png delete mode 100644 Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-42x92@3x.png rename Limelight/Images.xcassets/{Logo.imageset => SettingsButton.imageset}/Contents.json (88%) create mode 100644 Limelight/Images.xcassets/SettingsButton.imageset/settings.pdf rename Limelight/Images.xcassets/{PullArrow.imageset => UpIcon.imageset}/Contents.json (63%) create mode 100644 Limelight/Images.xcassets/UpIcon.imageset/up_arrow.pdf diff --git a/Limelight/Images.xcassets/Logo.imageset/logo.png b/Limelight/Images.xcassets/Logo.imageset/logo.png deleted file mode 100644 index 833682222b3584142f1fe7dc85c467e39840737d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6338 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 Eg3@XCI{*Lx 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 deleted file mode 100644 index 6a3a11b478f1fb7933b5a87b54a03eb871b332d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 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 deleted file mode 100644 index 383b416bcd9fe29b22f278360683b4f399ba78b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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= 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 deleted file mode 100644 index e7019422d6b31e96175a31a391c49d48d5b28afe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/Limelight/Images.xcassets/Logo.imageset/Contents.json b/Limelight/Images.xcassets/SettingsButton.imageset/Contents.json similarity index 88% rename from Limelight/Images.xcassets/Logo.imageset/Contents.json rename to Limelight/Images.xcassets/SettingsButton.imageset/Contents.json index 7be9c80..3616578 100644 --- a/Limelight/Images.xcassets/Logo.imageset/Contents.json +++ b/Limelight/Images.xcassets/SettingsButton.imageset/Contents.json @@ -2,11 +2,11 @@ "images" : [ { "idiom" : "universal", + "filename" : "settings.pdf", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "logo.png", "scale" : "2x" }, { diff --git a/Limelight/Images.xcassets/SettingsButton.imageset/settings.pdf b/Limelight/Images.xcassets/SettingsButton.imageset/settings.pdf new file mode 100644 index 0000000..1e7a799 --- /dev/null +++ b/Limelight/Images.xcassets/SettingsButton.imageset/settings.pdf @@ -0,0 +1,70 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xeTI0 @Z,=#O A}H ,.== dŢj*Vqt?ՄgI]yV3H2١?vKm |=p,EτN4vnbjG#OxR\L68Z+߉ p*Gi3}Q ^ʑ> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 75 75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20190830202122-07'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001010 00000 n +0000000794 00000 n +0000000722 00000 n +0000000015 00000 n +0000000700 00000 n +0000001075 00000 n +0000001191 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1243 +%%EOF diff --git a/Limelight/Images.xcassets/PullArrow.imageset/Contents.json b/Limelight/Images.xcassets/UpIcon.imageset/Contents.json similarity index 63% rename from Limelight/Images.xcassets/PullArrow.imageset/Contents.json rename to Limelight/Images.xcassets/UpIcon.imageset/Contents.json index 3e235a1..0f0fff7 100644 --- a/Limelight/Images.xcassets/PullArrow.imageset/Contents.json +++ b/Limelight/Images.xcassets/UpIcon.imageset/Contents.json @@ -2,17 +2,15 @@ "images" : [ { "idiom" : "universal", - "filename" : "pull-arrow-light-14x31@1x.png", + "filename" : "up_arrow.pdf", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "pull-arrow-light-28x61@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "pull-arrow-light-42x92@3x.png", "scale" : "3x" } ], diff --git a/Limelight/Images.xcassets/UpIcon.imageset/up_arrow.pdf b/Limelight/Images.xcassets/UpIcon.imageset/up_arrow.pdf new file mode 100644 index 0000000..1fa5a70 --- /dev/null +++ b/Limelight/Images.xcassets/UpIcon.imageset/up_arrow.pdf @@ -0,0 +1,70 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xUQ +@ Ds1F=G(?-e`ƒ$ + 5ZIqhоӗ4qA sTddl>؏H {n|K,}?5^H;U$} +endstream +endobj +5 0 obj + 114 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 75 75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20190830203401-07'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000516 00000 n +0000000300 00000 n +0000000228 00000 n +0000000015 00000 n +0000000206 00000 n +0000000581 00000 n +0000000697 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +749 +%%EOF diff --git a/Limelight/ViewControllers/MainFrameViewController.h b/Limelight/ViewControllers/MainFrameViewController.h index c6bcfba..9e986a8 100644 --- a/Limelight/ViewControllers/MainFrameViewController.h +++ b/Limelight/ViewControllers/MainFrameViewController.h @@ -18,8 +18,8 @@ @interface MainFrameViewController : UICollectionViewController #if !TARGET_OS_TV -@property (strong, nonatomic) IBOutlet UIButton *limelightLogoButton; -@property (weak, nonatomic) IBOutlet UIBarButtonItem *computerNameButton; +@property (weak, nonatomic) IBOutlet UIBarButtonItem *settingsButton; +@property (weak, nonatomic) IBOutlet UIBarButtonItem *upButton; #endif @end diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m index 6597cc7..623a0c0 100644 --- a/Limelight/ViewControllers/MainFrameViewController.m +++ b/Limelight/ViewControllers/MainFrameViewController.m @@ -50,8 +50,6 @@ bool _background; #if TARGET_OS_TV UITapGestureRecognizer* _menuRecognizer; -#else - UIButton* _pullArrow; #endif } static NSMutableSet* hostList; @@ -126,10 +124,10 @@ static NSMutableSet* hostList; return; } -#if TARGET_OS_TV self.title = host.name; -#else - self->_computerNameButton.title = host.name; + +#if !TARGET_OS_TV + [self->_upButton setImage:[UIImage imageNamed:@"UpIcon"]]; #endif [self.navigationController.navigationBar setNeedsLayout]; @@ -174,10 +172,10 @@ static NSMutableSet* hostList; return; } -#if TARGET_OS_TV self.title = host.name; -#else - self->_computerNameButton.title = host.name; + +#if !TARGET_OS_TV + [self->_upButton setImage:[UIImage imageNamed:@"UpIcon"]]; #endif [self.navigationController.navigationBar setNeedsLayout]; @@ -251,11 +249,13 @@ static NSMutableSet* hostList; [_appManager stopRetrieving]; _selectedHost = nil; -#if TARGET_OS_TV + self.title = @"Select Host"; -#else - _computerNameButton.title = @"No Host Selected"; + +#if !TARGET_OS_TV + [_upButton setImage:nil]; #endif + [self.collectionView reloadData]; [self.view addSubview:hostScrollView]; } @@ -651,30 +651,6 @@ static NSMutableSet* hostList; [(SettingsViewController*)[revealController rearViewController] saveSettings]; } - // Fade out the pull arrow - [UIView animateWithDuration:0.1 - animations:^{ - self->_pullArrow.alpha = 0.0; - } - completion:^(BOOL finished) { - // Flip the direction of the arrow - if (position == FrontViewPositionLeft) { - // Change the pull arrow back to the default rotation - self->_pullArrow.imageView.transform = CGAffineTransformMakeRotation(0); - } - else { - // Flip the pull arrow when the reveal is toggled - self->_pullArrow.imageView.transform = CGAffineTransformMakeRotation(M_PI); - } - - // Fade it back in - [UIView animateWithDuration:0.2 - animations:^{ - self->_pullArrow.alpha = 1.0; - } - completion:nil]; - }]; - currentPosition = position; } #endif @@ -705,13 +681,17 @@ static NSMutableSet* hostList; { [super viewDidLoad]; + self.title = @"Select Host"; + #if !TARGET_OS_TV // Set the side bar button action. When it's tapped, it'll show the sidebar. - [_limelightLogoButton addTarget:self.revealViewController action:@selector(revealToggle:) forControlEvents:UIControlEventTouchDown]; + [_settingsButton setTarget:self.revealViewController]; + [_settingsButton setAction:@selector(revealToggle:)]; // Set the host name button action. When it's tapped, it'll show the host selection view. - [_computerNameButton setTarget:self]; - [_computerNameButton setAction:@selector(showHostSelectionView)]; + [_upButton setTarget:self]; + [_upButton setAction:@selector(showHostSelectionView)]; + [_upButton setImage:nil]; // Set the gesture [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer]; @@ -724,8 +704,6 @@ static NSMutableSet* hostList; _menuRecognizer.allowedPressTypes = [[NSArray alloc] initWithObjects:[NSNumber numberWithLong:UIPressTypeMenu], nil]; self.navigationController.navigationBar.titleTextAttributes = [NSDictionary dictionaryWithObject:[UIColor whiteColor] forKey:NSForegroundColorAttributeName]; - - self.title = @"Select Host"; #endif _loadingFrame = [self.storyboard instantiateViewControllerWithIdentifier:@"loadingFrame"]; @@ -755,17 +733,6 @@ static NSMutableSet* hostList; [hostScrollView setShowsHorizontalScrollIndicator:NO]; hostScrollView.delaysContentTouches = NO; -#if !TARGET_OS_TV - _pullArrow = [[UIButton alloc] init]; - [_pullArrow addTarget:self.revealViewController action:@selector(revealToggle:) forControlEvents:UIControlEventTouchDown]; - [_pullArrow setImage:[UIImage imageNamed:@"PullArrow"] forState:UIControlStateNormal]; - [_pullArrow sizeToFit]; - _pullArrow.frame = CGRectMake(0, - self.collectionView.frame.size.height / 6 - _pullArrow.frame.size.height / 2 - self.navigationController.navigationBar.frame.size.height, - _pullArrow.frame.size.width, - _pullArrow.frame.size.height); -#endif - self.collectionView.delaysContentTouches = NO; self.collectionView.allowsMultipleSelection = NO; #if !TARGET_OS_TV @@ -776,9 +743,6 @@ static NSMutableSet* hostList; _discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self]; [self.view addSubview:hostScrollView]; -#if !TARGET_OS_TV - [self.view addSubview:_pullArrow]; -#endif } -(void)beginForegroundRefresh:(bool)refreshAppList diff --git a/iPad.storyboard b/iPad.storyboard index f0aeb1b..a75b703 100644 --- a/iPad.storyboard +++ b/iPad.storyboard @@ -45,24 +45,16 @@ - - + - + - - + + diff --git a/iPhone.storyboard b/iPhone.storyboard index 8bcd700..b704816 100644 --- a/iPhone.storyboard +++ b/iPhone.storyboard @@ -45,26 +45,18 @@ - - - + + + - - + + - - - + + +