diff --git a/Limelight/Images.xcassets/Logo.imageset/logo.png b/Limelight/Images.xcassets/Logo.imageset/logo.png deleted file mode 100644 index 8336822..0000000 Binary files a/Limelight/Images.xcassets/Logo.imageset/logo.png and /dev/null differ 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 6a3a11b..0000000 Binary files a/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-14x31@1x.png and /dev/null differ 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 383b416..0000000 Binary files a/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-28x61@2x.png and /dev/null differ 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 e701942..0000000 Binary files a/Limelight/Images.xcassets/PullArrow.imageset/pull-arrow-light-42x92@3x.png and /dev/null differ 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 @@ - - - + + + - - + + - - - + + +