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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 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!ia0y~yV31*8V6f$2V_;y|_m`8Mfq{V~-O<;Pfnj4m_n$;o z1_lO&WRDh+i z#(Mch>H3D2mX`VkM*2oZxVRW4>ucRJV?~azbG>`uOtyg%Kf$Ddy~ux{P!%g;VOn)JNyagOcz z-y7Ik+6!aL^F=uV7@JtHDSAbgIvECPd7Wf?vQ$xfcC>=mbDoLMT{Rz{k2){*RC6O98HVg|JK{OLGwS4#oC*NPKFK)n;kbgm}#(9v>!UT zx|xgR-0#%}5$>#Iu7PuM8S^*joc@=?5SdW0SYm080fUr%Zq>SGhA(gSOD#NS(sRJX zcmFbh=Yor;Om2U*kinB}NxMqyj13w`Ba~8IG(E-Dbi53wc}NC&U25fw4qavLr?vXP zw%nmtDw&+`}9bb^C=AGeuACyo%UHx3vIVCg!0Kw27 Am;e9( 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!ia0y~yV9;V14Ba#1H&%{28MO>_ z%)r1c48n{Iv*t)JFfc}DhD4M^`1)8S=jZArrsOB3>Q&?xFo1wfg;hmvL2hbEqC!P( zPF}H9g{=};g;id$6-ZcLNdc^+B->Ug!Z$#{Ilm}X!Bo#g&p^qJOF==wrYI%ND#*nR zs=X*B%~mO+q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fU}C?!p|xH7LKu|hYmSQ%mn z%p8~0;^d;tf|AVqJOz-siAnjTCALaRAd3`W0OHP)%rt~edBsp~CFkergJkp#^$hgk zW`m3eiCXy=Wv1qpB!bMhGqeG#L=l79W1|nU9LX^dpMph$T-@xqZ1lll0tz2HE}ui{ zkqithe4Z|jAsMW1XZ!l!Hjp_sdx>xSi?Ca~QD$ljJ!h9iT-1Bq&~;?{L*oOP@(sr2 z`;PQoZrS4PukA5K@!C3%=)}eAFI@Qk=I3HJ7S^B;YsJesCyU-(dpG(1f5W`D3c30D z^&f0&CMhml^!nG$0*f!-t8CZa&HI1FM0fwbeR0Z_U)tFH1y*=Z5^<~3I$fkBz@f7E z;)~Z6HuG-Yx>e=L^p}5~5R*axyQh$po~uPth@i^cWq{I@#dGD3t764EL!k} zIbqf0gjLIxCZ4E1&!O75eTm|l4=NHoZZ^78_HZv$Ov&d~J)|Ob^nmc@f72#J&uR(a z7COe}I7M*5(%lMKj)!h2bQm#hDG_(k^^lNe33O|i_O59KD`#@E!YPgmmtqCBDkSCz zxJWWa?c!b}rqaXPq@nEKUG8|Lsb%BC`HEI$=KRvD_8m+xSaMeDO{CWi-f0Z&n^wP! zbJ_UTU3#_9RDpN9Jd~2Ww_MHo`uzFx#opfD`OB9rTeKp)c;}seA3ttnyQsyv{Egct z(W=Ty%Z39F&Yba)YI?!2V9$;nE83kFCM^ueSm3L6D6eCyXjjH$)6|MDf=5^!-??f{ zoptQqujx^1r`g)uFL!3Vl~H^P^BZ2cSexCvIdFS9Rx;oj2mNM1)k z^iQwrmCC#SP3!fX7&mrB{(t%9%a)d@It^CeuXaUhgsoEwTcM+NaedIrE3Q9m-M8=; zsei5d`PJI%0lw++|#?SVUL{aSC=EZ(+o zQU2F2#w^~8-R3HM$`N_DNBW@|_f}P@?xRdU?%lj~_wL^g{nHEcw%>LY2@E(TA^@iHpBamE$*y=_gE_W)orvoKB*n3ws{!nIK`at-eb;wu0?w|Kgju4 zeA%zkmFsu1%)8xuD(CUV^`cT$w-&nynY%Ah{Y2~&DVKQ;pZ^^@*7n`W-^8%dilb68`s2;5 fTer%u`2COR>4U`|bn^Es1QoKLu6{1-oD!M> +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 3e235a19..0f0fff7b 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 00000000..1fa5a70f --- /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 c6bcfba2..9e986a8d 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 6597cc77..623a0c0d 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 f0aeb1bc..a75b703a 100644 --- a/iPad.storyboard +++ b/iPad.storyboard @@ -45,24 +45,16 @@ - - + - + - - + + diff --git a/iPhone.storyboard b/iPhone.storyboard index 8bcd7003..b704816f 100644 --- a/iPhone.storyboard +++ b/iPhone.storyboard @@ -45,26 +45,18 @@ - - - + + + - - + + - - - + + +