mirror of
https://github.com/moonlight-stream/moonlight-ios.git
synced 2025-07-02 15:56:21 +00:00
Remove @available checks for < iOS 9.3
This commit is contained in:
parent
313af5a7e7
commit
dc9b5b7c96
@ -24,11 +24,9 @@ static NSString* DB_NAME = @"Limelight_iOS.sqlite";
|
|||||||
|
|
||||||
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
|
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
|
||||||
#if !TARGET_OS_TV
|
#if !TARGET_OS_TV
|
||||||
if (@available(iOS 9.0, *)) {
|
UIApplicationShortcutItem* shortcut = [launchOptions valueForKey:UIApplicationLaunchOptionsShortcutItemKey];
|
||||||
UIApplicationShortcutItem* shortcut = [launchOptions valueForKey:UIApplicationLaunchOptionsShortcutItemKey];
|
if (shortcut != nil) {
|
||||||
if (shortcut != nil) {
|
_pcUuidToLoad = (NSString*)[shortcut.userInfo objectForKey:@"UUID"];
|
||||||
_pcUuidToLoad = (NSString*)[shortcut.userInfo objectForKey:@"UUID"];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return YES;
|
return YES;
|
||||||
|
@ -49,12 +49,7 @@ static UIImage* noImage;
|
|||||||
UILongPressGestureRecognizer* longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(appLongClicked:)];
|
UILongPressGestureRecognizer* longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(appLongClicked:)];
|
||||||
[self addGestureRecognizer:longPressRecognizer];
|
[self addGestureRecognizer:longPressRecognizer];
|
||||||
|
|
||||||
if (@available(iOS 9.0, tvOS 9.0, *)) {
|
[self addTarget:self action:@selector(appClicked:) forControlEvents:UIControlEventPrimaryActionTriggered];
|
||||||
[self addTarget:self action:@selector(appClicked:) forControlEvents:UIControlEventPrimaryActionTriggered];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
[self addTarget:self action:@selector(appClicked:) forControlEvents:UIControlEventTouchUpInside];
|
|
||||||
}
|
|
||||||
|
|
||||||
[self addTarget:self action:@selector(buttonSelected:) forControlEvents:UIControlEventTouchDown];
|
[self addTarget:self action:@selector(buttonSelected:) forControlEvents:UIControlEventTouchDown];
|
||||||
[self addTarget:self action:@selector(buttonDeselected:) forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchCancel | UIControlEventTouchDragExit];
|
[self addTarget:self action:@selector(buttonDeselected:) forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchCancel | UIControlEventTouchDragExit];
|
||||||
|
@ -102,12 +102,7 @@ static const int LABEL_DY = 20;
|
|||||||
self = [self init];
|
self = [self init];
|
||||||
_callback = callback;
|
_callback = callback;
|
||||||
|
|
||||||
if (@available(iOS 9.0, tvOS 9.0, *)) {
|
[self addTarget:self action:@selector(addClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
|
||||||
[self addTarget:self action:@selector(addClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
[self addTarget:self action:@selector(addClicked) forControlEvents:UIControlEventTouchUpInside];
|
|
||||||
}
|
|
||||||
|
|
||||||
[_hostLabel setText:@"Add Host Manually"];
|
[_hostLabel setText:@"Add Host Manually"];
|
||||||
[_hostLabel sizeToFit];
|
[_hostLabel sizeToFit];
|
||||||
@ -127,12 +122,7 @@ static const int LABEL_DY = 20;
|
|||||||
UILongPressGestureRecognizer* longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(hostLongClicked:)];
|
UILongPressGestureRecognizer* longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(hostLongClicked:)];
|
||||||
[self addGestureRecognizer:longPressRecognizer];
|
[self addGestureRecognizer:longPressRecognizer];
|
||||||
|
|
||||||
if (@available(iOS 9.0, tvOS 9.0, *)) {
|
[self addTarget:self action:@selector(hostClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
|
||||||
[self addTarget:self action:@selector(hostClicked) forControlEvents:UIControlEventPrimaryActionTriggered];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
[self addTarget:self action:@selector(hostClicked) forControlEvents:UIControlEventTouchUpInside];
|
|
||||||
}
|
|
||||||
|
|
||||||
[self updateContentsForHost:host];
|
[self updateContentsForHost:host];
|
||||||
[self startUpdateLoop];
|
[self startUpdateLoop];
|
||||||
|
@ -1138,27 +1138,25 @@ static NSMutableSet* hostList;
|
|||||||
|
|
||||||
- (void)updateHostShortcuts {
|
- (void)updateHostShortcuts {
|
||||||
#if !TARGET_OS_TV
|
#if !TARGET_OS_TV
|
||||||
if (@available(iOS 9.0, *)) {
|
NSMutableArray* quickActions = [[NSMutableArray alloc] init];
|
||||||
NSMutableArray* quickActions = [[NSMutableArray alloc] init];
|
|
||||||
|
|
||||||
@synchronized (hostList) {
|
@synchronized (hostList) {
|
||||||
for (TemporaryHost* host in hostList) {
|
for (TemporaryHost* host in hostList) {
|
||||||
// Pair state may be unknown if we haven't polled it yet, but the app list
|
// Pair state may be unknown if we haven't polled it yet, but the app list
|
||||||
// count will persist from paired PCs
|
// count will persist from paired PCs
|
||||||
if ([host.appList count] > 0) {
|
if ([host.appList count] > 0) {
|
||||||
UIApplicationShortcutItem* shortcut = [[UIApplicationShortcutItem alloc]
|
UIApplicationShortcutItem* shortcut = [[UIApplicationShortcutItem alloc]
|
||||||
initWithType:@"PC"
|
initWithType:@"PC"
|
||||||
localizedTitle:host.name
|
localizedTitle:host.name
|
||||||
localizedSubtitle:nil
|
localizedSubtitle:nil
|
||||||
icon:[UIApplicationShortcutIcon iconWithType:UIApplicationShortcutIconTypePlay]
|
icon:[UIApplicationShortcutIcon iconWithType:UIApplicationShortcutIconTypePlay]
|
||||||
userInfo:[NSDictionary dictionaryWithObject:host.uuid forKey:@"UUID"]];
|
userInfo:[NSDictionary dictionaryWithObject:host.uuid forKey:@"UUID"]];
|
||||||
[quickActions addObject: shortcut];
|
[quickActions addObject: shortcut];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[UIApplication sharedApplication].shortcutItems = quickActions;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[UIApplication sharedApplication].shortcutItems = quickActions;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user