moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-01 15:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite loading frame management (again)

Browse Source
This commit is contained in:
Cameron Gutman 2018-12-28 16:45:05 -08:00
parent 611358e35c
commit 08e169eb23
3 changed files with 43 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Limelight/ViewControllers/LoadingFrameViewController.h
View File

@ -10,5 +10,11 @@
@interface LoadingFrameViewController : UIViewController
- (void)showLoadingFrame:(void (^)(void))completion;
- (void)dismissLoadingFrame:(void (^)(void))completion;
- (BOOL)isShown;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *loadingSpinner;
@end

49
Limelight/ViewControllers/LoadingFrameViewController.m
View File

@ -8,11 +8,9 @@
#import "LoadingFrameViewController.h"
@interface LoadingFrameViewController ()
@end
@implementation LoadingFrameViewController
@implementation LoadingFrameViewController {
BOOL presented;
};
- (void)viewDidLoad {
[super viewDidLoad];
@ -20,19 +18,38 @@
self.loadingSpinner.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2);
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
- (UIViewController*) activeViewController {
UIViewController *topController = [UIApplication sharedApplication].keyWindow.rootViewController;
while (topController.presentedViewController) {
topController = topController.presentedViewController;
}
return topController;
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
- (void)showLoadingFrame:(void (^)(void))completion {
if (!presented) {
presented = YES;
[[self activeViewController] presentViewController:self animated:NO completion:completion];
}
else if (completion) {
completion();
}
}
- (void)dismissLoadingFrame:(void (^)(void))completion {
if (presented) {
presented = NO;
[self dismissViewControllerAnimated:NO completion:completion];
}
else if (completion) {
completion();
}
}
- (BOOL)isShown {
return presented;
}
*/
@end

71
Limelight/ViewControllers/MainFrameViewController.m
View File

@ -48,7 +48,6 @@
NSArray* _sortedAppList;
NSCache* _boxArtCache;
bool _background;
dispatch_semaphore_t _loadingFrameSemaphore;
#if TARGET_OS_TV
UITapGestureRecognizer* _menuRecognizer;
#else
@ -383,20 +382,6 @@ static NSMutableSet* hostList;
return topController;
}
- (BOOL) loadingFrameIsPresented {
UIViewController *nextController = [UIApplication sharedApplication].keyWindow.rootViewController;
while (nextController) {
if (nextController == _loadingFrame) {
return YES;
}
nextController = nextController.presentedViewController;
}
return NO;
}
- (void)hostLongClicked:(TemporaryHost *)host view:(UIView *)view {
Log(LOG_D, @"Long clicked host: %@", host.name);
UIAlertController* longClickAlert = [UIAlertController alertControllerWithTitle:host.name message:@"" preferredStyle:UIAlertControllerStyleActionSheet];
@ -677,66 +662,18 @@ static NSMutableSet* hostList;
}
- (void) showLoadingFrame:(void (^)(void))completion {
// Wait for all loading frame operations to complete before starting this one
dispatch_semaphore_wait(_loadingFrameSemaphore, DISPATCH_TIME_FOREVER);
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
dispatch_async(dispatch_get_main_queue(), ^{
// If loading frame is already active, just complete it now otherwise
// we may not get a completion callback.
if ([self loadingFrameIsPresented]) {
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
return;
}
// Avoid animating this as it significantly prolongs the loading frame's time on screen
[[self activeViewController] presentViewController:self->_loadingFrame animated:NO completion:^{
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
}];
});
});
[_loadingFrame showLoadingFrame:completion];
}
- (void) hideLoadingFrame:(void (^)(void))completion {
// Wait for all loading frame operations to complete before starting this one
dispatch_semaphore_wait(_loadingFrameSemaphore, DISPATCH_TIME_FOREVER);
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
dispatch_async(dispatch_get_main_queue(), ^{
// If loading frame is already dismissed, just complete it now otherwise
// we may not get a completion callback.
if (![self loadingFrameIsPresented]) {
[self enableNavigation];
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
return;
}
// See comment above in showLoadingFrame about why we don't animate this
[self->_loadingFrame dismissViewControllerAnimated:NO completion:^{
[self enableNavigation];
dispatch_semaphore_signal(self->_loadingFrameSemaphore);
if (completion) {
completion();
}
}];
});
});
[self enableNavigation];
[_loadingFrame dismissLoadingFrame:completion];
}
- (void)viewDidLoad
{
[super viewDidLoad];
// Ensure only one loading frame operation can take place at a time
_loadingFrameSemaphore = dispatch_semaphore_create(1);
#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];
@ -888,7 +825,7 @@ static NSMutableSet* hostList;
// loading frame which will cause an infinite loop by starting
// another loading frame. To avoid this, just don't refresh
// if we're coming back from a loading frame view.
[self beginForegroundRefresh: ![[self activeViewController] isKindOfClass:[LoadingFrameViewController class]]];
[self beginForegroundRefresh: !([_loadingFrame isShown] || [_loadingFrame isBeingDismissed])];
}
- (void)viewDidDisappear:(BOOL)animated