moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-06-17 14:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch back to text for navigation buttons

Browse Source
This commit is contained in:
Cameron Gutman
2019-09-14 12:46:50 -07:00
parent 8fb465d3ca
commit f24c28c848
3 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Limelight/ViewControllers/MainFrameViewController.m
+16 -15
View File
@@ -109,6 +109,18 @@ static NSMutableSet* hostList;
}); });
} }
- (void)disableUpButton {
#if !TARGET_OS_TV
[self->_upButton setTitle:nil];
#endif
}
- (void)enableUpButton {
#if !TARGET_OS_TV
[self->_upButton setTitle:@"Select New Host"];
#endif
}
- (void)alreadyPaired { - (void)alreadyPaired {
BOOL usingCachedAppList = false; BOOL usingCachedAppList = false;
@@ -126,11 +138,7 @@ static NSMutableSet* hostList;
self.title = host.name; self.title = host.name;
#if !TARGET_OS_TV [self enableUpButton];
[self->_upButton setImage:[UIImage imageNamed:@"UpIcon"]];
#endif
[self.navigationController.navigationBar setNeedsLayout];
[self updateAppsForHost:host]; [self updateAppsForHost:host];
[self hideLoadingFrame: nil]; [self hideLoadingFrame: nil];
}); });
@@ -173,11 +181,7 @@ static NSMutableSet* hostList;
} }
self.title = host.name; self.title = host.name;
[self enableUpButton];
#if !TARGET_OS_TV
[self->_upButton setImage:[UIImage imageNamed:@"UpIcon"]];
#endif
[self.navigationController.navigationBar setNeedsLayout];
[self updateAppsForHost:host]; [self updateAppsForHost:host];
[self->_appManager stopRetrieving]; [self->_appManager stopRetrieving];
@@ -251,10 +255,7 @@ static NSMutableSet* hostList;
_selectedHost = nil; _selectedHost = nil;
self.title = @"Select Host"; self.title = @"Select Host";
[self disableUpButton];
#if !TARGET_OS_TV
[_upButton setImage:nil];
#endif
[self.collectionView reloadData]; [self.collectionView reloadData];
[self.view addSubview:hostScrollView]; [self.view addSubview:hostScrollView];
@@ -707,7 +708,7 @@ static NSMutableSet* hostList;
// Set the host name button action. When it's tapped, it'll show the host selection view. // Set the host name button action. When it's tapped, it'll show the host selection view.
[_upButton setTarget:self]; [_upButton setTarget:self];
[_upButton setAction:@selector(showHostSelectionView)]; [_upButton setAction:@selector(showHostSelectionView)];
[_upButton setImage:nil]; [self disableUpButton];
// Set the gesture // Set the gesture
[self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer]; [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer];
iPad.storyboard
+2 -9
View File
@@ -37,12 +37,8 @@
</connections> </connections>
</collectionView> </collectionView>
<navigationItem key="navigationItem" id="pSu-bl-gL9"> <navigationItem key="navigationItem" id="pSu-bl-gL9">
<barButtonItem key="leftBarButtonItem" image="SettingsButton" id="mSL-ru-nRm"> <barButtonItem key="leftBarButtonItem" title="Settings" id="mSL-ru-nRm"/>
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU"/>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU">
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</barButtonItem>
</navigationItem> </navigationItem>
<connections> <connections>
<outlet property="settingsButton" destination="mSL-ru-nRm" id="NRf-lv-vlh"/> <outlet property="settingsButton" destination="mSL-ru-nRm" id="NRf-lv-vlh"/>
@@ -351,7 +347,4 @@
<point key="canvasLocation" x="1530.46875" y="834.9609375"/> <point key="canvasLocation" x="1530.46875" y="834.9609375"/>
</scene> </scene>
</scenes> </scenes>
<resources>
<image name="SettingsButton" width="75" height="75"/>
</resources>
</document> </document>
iPhone.storyboard
+2 -9
View File
@@ -38,12 +38,8 @@
</collectionView> </collectionView>
<toolbarItems/> <toolbarItems/>
<navigationItem key="navigationItem" id="pSu-bl-gL9"> <navigationItem key="navigationItem" id="pSu-bl-gL9">
<barButtonItem key="leftBarButtonItem" image="SettingsButton" id="mSL-ru-nRm"> <barButtonItem key="leftBarButtonItem" title="Settings" id="mSL-ru-nRm"/>
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU"/>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU">
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</barButtonItem>
</navigationItem> </navigationItem>
<connections> <connections>
<outlet property="settingsButton" destination="mSL-ru-nRm" id="NRf-lv-vlh"/> <outlet property="settingsButton" destination="mSL-ru-nRm" id="NRf-lv-vlh"/>
@@ -352,7 +348,4 @@
<point key="canvasLocation" x="3031" y="1487"/> <point key="canvasLocation" x="3031" y="1487"/>
</scene> </scene>
</scenes> </scenes>
<resources>
<image name="SettingsButton" width="75" height="75"/>
</resources>
</document> </document>