EddyVerbruggen#7 No visible @interface for 'UIView' declares the sele…

…ctor 'stringByEvaluatingJavaScriptFromString:'
Telerik-Verified-Plugins · Dec 16, 2015 · bed52b3 · bed52b3
1 parent 8b8bee6
commit bed52b3
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 106 deletions.
diff --git a/README.md b/README.md
@@ -213,6 +213,7 @@ This is the same as the `type` param of `configureQuickActions`, so it's what yo
 `onHomeIconPressed` as `payload.type`. Just do something cool with that info.
 
 ## 6. Changelog
+* 1.3.2 Compatibility with Cordova-iOS 4.
 * 1.3.1 Added `timestamp` to the response of `watchForceTouches`.
 * 1.3.0 You can now receive notifications when the user applies a 'Force Touch' on the webview.
 * 1.2.2 Documentation on how to localize the title and subtitle of your static icons.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-3dtouch",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Add Quick Actions to your Home Screen which can be triggered by 3D Touch. Also, you can enable Link Preview with this plugin. Supported on iPhone6S an up.",
   "cordova": {
     "id": "cordova-plugin-3dtouch",

diff --git a/plugin.xml b/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <plugin
     id="cordova-plugin-3dtouch"
-    version="1.3.1"
+    version="1.3.2"
     xmlns="http://apache.org/cordova/ns/plugins/1.0">
 
   <name>3D Touch</name>

diff --git a/src/ios/app/AppDelegate+threedeetouch.m b/src/ios/app/AppDelegate+threedeetouch.m
@@ -17,7 +17,13 @@ - (void)application:(UIApplication *)application performActionForShortcutItem:(U
 - (void) callJavascriptFunctionWhenAvailable:(NSString*)function {
   ThreeDeeTouch *threeDeeTouch = [self.viewController getCommandInstance:@"ThreeDeeTouch"];
   if (threeDeeTouch.initDone) {
-    [threeDeeTouch.webView stringByEvaluatingJavaScriptFromString:function];
+    if ([threeDeeTouch.webView respondsToSelector:@selector(stringByEvaluatingJavaScriptFromString:)]) {
+      // Cordova-iOS pre-4
+      [threeDeeTouch.webView performSelectorOnMainThread:@selector(stringByEvaluatingJavaScriptFromString:) withObject:function waitUntilDone:NO];
+    } else {
+      // Cordova-iOS 4+
+      [threeDeeTouch.webView performSelectorOnMainThread:@selector(evaluateJavaScript:completionHandler:) withObject:function waitUntilDone:NO];
+    }
   } else {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 25 * NSEC_PER_MSEC), dispatch_get_main_queue(), ^{
       [self callJavascriptFunctionWhenAvailable:function];

diff --git a/src/ios/app/ThreeDeeTouch.m b/src/ios/app/ThreeDeeTouch.m
@@ -6,108 +6,114 @@
 @implementation ThreeDeeTouch
 
 - (void) deviceIsReady:(CDVInvokedUrlCommand *)command {
-  self.initDone = YES;
+    self.initDone = YES;
 }
 
 - (void) isAvailable:(CDVInvokedUrlCommand *)command {
-
-  bool avail = NO;
-
-  if (IsAtLeastiOSVersion(@"9")) {
-    avail = [self.viewController.traitCollection forceTouchCapability] == UIForceTouchCapabilityAvailable;
-  }
-
-  CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:avail];
-  [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    
+    bool avail = NO;
+    
+    if (IsAtLeastiOSVersion(@"9")) {
+        avail = [self.viewController.traitCollection forceTouchCapability] == UIForceTouchCapabilityAvailable;
+    }
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:avail];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void) watchForceTouches:(CDVInvokedUrlCommand*)command {
-  ForceTouchRecognizer* forceTouchRecognizer = [[ForceTouchRecognizer alloc] initWithTarget:self action:nil];
-  forceTouchRecognizer.callbackId = command.callbackId;
-  forceTouchRecognizer.commandDelegate = self.commandDelegate;
-  [self.webView addGestureRecognizer: forceTouchRecognizer];
-
-  CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_NO_RESULT];
-  pluginResult.keepCallback = [NSNumber numberWithBool:YES];
-  [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    ForceTouchRecognizer* forceTouchRecognizer = [[ForceTouchRecognizer alloc] initWithTarget:self action:nil];
+    forceTouchRecognizer.callbackId = command.callbackId;
+    forceTouchRecognizer.commandDelegate = self.commandDelegate;
+    [self.webView addGestureRecognizer: forceTouchRecognizer];
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_NO_RESULT];
+    pluginResult.keepCallback = [NSNumber numberWithBool:YES];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void) enableLinkPreview:(CDVInvokedUrlCommand *)command {
-  self.webView.allowsLinkPreview = YES;
-  [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+    if ([self.webView class] == [UIWebView class]) {
+        UIWebView *w = (UIWebView*)self.webView;
+        w.allowsLinkPreview = YES;
+    }
+    [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
 }
 
 - (void) disableLinkPreview:(CDVInvokedUrlCommand *)command {
-  self.webView.allowsLinkPreview = NO;
-  [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+    if ([self.webView class] == [UIWebView class]) {
+        UIWebView *w = (UIWebView*)self.webView;
+        w.allowsLinkPreview = NO;
+    }
+    [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
 }
 
 - (void) configureQuickActions:(CDVInvokedUrlCommand *)command {
-  NSDictionary *actions = [command.arguments objectAtIndex:0];
-
-  NSMutableArray *items = [[NSMutableArray alloc] init];
-
-  for (NSDictionary *action in actions) {
-    NSString *type = [action objectForKey:@"type"];
-    NSString *title = [action objectForKey:@"title"];
-    NSString *subtitle = [action objectForKey:@"subtitle"];
-    NSString *iconType = [action objectForKey:@"iconType"];
-    NSString *iconTemplate = [action objectForKey:@"iconTemplate"];
-
-    UIApplicationShortcutIcon *icon = nil;
-    if (iconType != nil) {
-      icon = [UIApplicationShortcutIcon iconWithType:[self UIApplicationShortcutIconTypeFromString:[iconType lowercaseString]]];
-    } else if (iconTemplate != nil) {
-      icon = [UIApplicationShortcutIcon iconWithTemplateImageName:iconTemplate];
+    NSDictionary *actions = [command.arguments objectAtIndex:0];
+
+    NSMutableArray *items = [[NSMutableArray alloc] init];
+
+    for (NSDictionary *action in actions) {
+        NSString *type = [action objectForKey:@"type"];
+        NSString *title = [action objectForKey:@"title"];
+        NSString *subtitle = [action objectForKey:@"subtitle"];
+        NSString *iconType = [action objectForKey:@"iconType"];
+        NSString *iconTemplate = [action objectForKey:@"iconTemplate"];
+
+        UIApplicationShortcutIcon *icon = nil;
+        if (iconType != nil) {
+            icon = [UIApplicationShortcutIcon iconWithType:[self UIApplicationShortcutIconTypeFromString:[iconType lowercaseString]]];
+        } else if (iconTemplate != nil) {
+            icon = [UIApplicationShortcutIcon iconWithTemplateImageName:iconTemplate];
+        }
+
+        [items addObject:[[UIApplicationShortcutItem alloc]initWithType: type localizedTitle: title localizedSubtitle: subtitle icon: icon userInfo: nil]];
     }
-
-    [items addObject:[[UIApplicationShortcutItem alloc]initWithType: type localizedTitle: title localizedSubtitle: subtitle icon: icon userInfo: nil]];
-  }
-
-  [UIApplication sharedApplication].shortcutItems = items;
-  [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+
+    [UIApplication sharedApplication].shortcutItems = items;
+    [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
 }
 
 - (UIApplicationShortcutIconType) UIApplicationShortcutIconTypeFromString:(NSString*)str {
-// iOS 9.0 icons:
-       if ([str isEqualToString:@"compose"])       return UIApplicationShortcutIconTypeCompose;
-  else if ([str isEqualToString:@"play"])          return UIApplicationShortcutIconTypePlay;
-  else if ([str isEqualToString:@"pause"])         return UIApplicationShortcutIconTypePause;
-  else if ([str isEqualToString:@"add"])           return UIApplicationShortcutIconTypeAdd;
-  else if ([str isEqualToString:@"location"])      return UIApplicationShortcutIconTypeLocation;
-  else if ([str isEqualToString:@"search"])        return UIApplicationShortcutIconTypeSearch;
-  else if ([str isEqualToString:@"share"])         return UIApplicationShortcutIconTypeShare;
-
-// iOS 9.1 icons:
+    // iOS 9.0 icons:
+    if ([str isEqualToString:@"compose"])       return UIApplicationShortcutIconTypeCompose;
+    else if ([str isEqualToString:@"play"])          return UIApplicationShortcutIconTypePlay;
+    else if ([str isEqualToString:@"pause"])         return UIApplicationShortcutIconTypePause;
+    else if ([str isEqualToString:@"add"])           return UIApplicationShortcutIconTypeAdd;
+    else if ([str isEqualToString:@"location"])      return UIApplicationShortcutIconTypeLocation;
+    else if ([str isEqualToString:@"search"])        return UIApplicationShortcutIconTypeSearch;
+    else if ([str isEqualToString:@"share"])         return UIApplicationShortcutIconTypeShare;
+    
+    // iOS 9.1 icons:
 #ifdef __IPHONE_9_1
-  else if ([str isEqualToString:@"prohibit"])      return UIApplicationShortcutIconTypeProhibit;
-  else if ([str isEqualToString:@"contact"])       return UIApplicationShortcutIconTypeContact;
-  else if ([str isEqualToString:@"home"])          return UIApplicationShortcutIconTypeHome;
-  else if ([str isEqualToString:@"marklocation"])  return UIApplicationShortcutIconTypeMarkLocation;
-  else if ([str isEqualToString:@"favorite"])      return UIApplicationShortcutIconTypeFavorite;
-  else if ([str isEqualToString:@"love"])          return UIApplicationShortcutIconTypeLove;
-  else if ([str isEqualToString:@"cloud"])         return UIApplicationShortcutIconTypeCloud;
-  else if ([str isEqualToString:@"invitation"])    return UIApplicationShortcutIconTypeInvitation;
-  else if ([str isEqualToString:@"confirmation"])  return UIApplicationShortcutIconTypeConfirmation;
-  else if ([str isEqualToString:@"mail"])          return UIApplicationShortcutIconTypeMail;
-  else if ([str isEqualToString:@"message"])       return UIApplicationShortcutIconTypeMessage;
-  else if ([str isEqualToString:@"date"])          return UIApplicationShortcutIconTypeDate;
-  else if ([str isEqualToString:@"time"])          return UIApplicationShortcutIconTypeTime;
-  else if ([str isEqualToString:@"capturephoto"])  return UIApplicationShortcutIconTypeCapturePhoto;
-  else if ([str isEqualToString:@"capturevideo"])  return UIApplicationShortcutIconTypeCaptureVideo;
-  else if ([str isEqualToString:@"task"])          return UIApplicationShortcutIconTypeTask;
-  else if ([str isEqualToString:@"taskcompleted"]) return UIApplicationShortcutIconTypeTaskCompleted;
-  else if ([str isEqualToString:@"alarm"])         return UIApplicationShortcutIconTypeAlarm;
-  else if ([str isEqualToString:@"bookmark"])      return UIApplicationShortcutIconTypeBookmark;
-  else if ([str isEqualToString:@"shuffle"])       return UIApplicationShortcutIconTypeShuffle;
-  else if ([str isEqualToString:@"audio"])         return UIApplicationShortcutIconTypeAudio;
-  else if ([str isEqualToString:@"update"])        return UIApplicationShortcutIconTypeUpdate;
+    else if ([str isEqualToString:@"prohibit"])      return UIApplicationShortcutIconTypeProhibit;
+    else if ([str isEqualToString:@"contact"])       return UIApplicationShortcutIconTypeContact;
+    else if ([str isEqualToString:@"home"])          return UIApplicationShortcutIconTypeHome;
+    else if ([str isEqualToString:@"marklocation"])  return UIApplicationShortcutIconTypeMarkLocation;
+    else if ([str isEqualToString:@"favorite"])      return UIApplicationShortcutIconTypeFavorite;
+    else if ([str isEqualToString:@"love"])          return UIApplicationShortcutIconTypeLove;
+    else if ([str isEqualToString:@"cloud"])         return UIApplicationShortcutIconTypeCloud;
+    else if ([str isEqualToString:@"invitation"])    return UIApplicationShortcutIconTypeInvitation;
+    else if ([str isEqualToString:@"confirmation"])  return UIApplicationShortcutIconTypeConfirmation;
+    else if ([str isEqualToString:@"mail"])          return UIApplicationShortcutIconTypeMail;
+    else if ([str isEqualToString:@"message"])       return UIApplicationShortcutIconTypeMessage;
+    else if ([str isEqualToString:@"date"])          return UIApplicationShortcutIconTypeDate;
+    else if ([str isEqualToString:@"time"])          return UIApplicationShortcutIconTypeTime;
+    else if ([str isEqualToString:@"capturephoto"])  return UIApplicationShortcutIconTypeCapturePhoto;
+    else if ([str isEqualToString:@"capturevideo"])  return UIApplicationShortcutIconTypeCaptureVideo;
+    else if ([str isEqualToString:@"task"])          return UIApplicationShortcutIconTypeTask;
+    else if ([str isEqualToString:@"taskcompleted"]) return UIApplicationShortcutIconTypeTaskCompleted;
+    else if ([str isEqualToString:@"alarm"])         return UIApplicationShortcutIconTypeAlarm;
+    else if ([str isEqualToString:@"bookmark"])      return UIApplicationShortcutIconTypeBookmark;
+    else if ([str isEqualToString:@"shuffle"])       return UIApplicationShortcutIconTypeShuffle;
+    else if ([str isEqualToString:@"audio"])         return UIApplicationShortcutIconTypeAudio;
+    else if ([str isEqualToString:@"update"])        return UIApplicationShortcutIconTypeUpdate;
 #endif
-
-  else {
-    NSLog(@"Invalid iconType passed to the 3D Touch plugin. So not adding one.");
-    return 0;
-  }
+    
+    else {
+        NSLog(@"Invalid iconType passed to the 3D Touch plugin. So not adding one.");
+        return 0;
+    }
 }
 @end
 
@@ -117,29 +123,29 @@ @implementation ForceTouchRecognizer
 double lastEvent = 0;
 
 - (void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
-  for (UITouch* touch in touches) {
-    CGFloat percentage = (touch.force / touch.maximumPossibleForce) * 100;
-    if (percentage >= 75) {
-      // let's not flood the callback with multiple hits within the same second
-      NSTimeInterval ts = touch.timestamp;
-      int diff = ts - lastEvent;
-      if (diff > 0) {
-        lastEvent = ts;
-        CGPoint coordinates = [touch locationInView:self.view];
-        NSMutableDictionary *result = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
-                                      [NSString stringWithFormat:@"%d", (int)percentage]   , @"force",
-                                      [NSString stringWithFormat:@"%d", (int)coordinates.x], @"x",
-                                      [NSString stringWithFormat:@"%d", (int)coordinates.y], @"y",
-                                      // no need to use the touch.timestamp really since it's simply 'now'
-                                      [NSString stringWithFormat:@"%f", [[NSDate date] timeIntervalSince1970]], @"timestamp",
-                                      nil];
-
-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:result];
-        pluginResult.keepCallback = [NSNumber numberWithBool:YES];
-        [_commandDelegate sendPluginResult:pluginResult callbackId:_callbackId];
-      }
+    for (UITouch* touch in touches) {
+        CGFloat percentage = (touch.force / touch.maximumPossibleForce) * 100;
+        if (percentage >= 75) {
+            // let's not flood the callback with multiple hits within the same second
+            NSTimeInterval ts = touch.timestamp;
+            int diff = ts - lastEvent;
+            if (diff > 0) {
+                lastEvent = ts;
+                CGPoint coordinates = [touch locationInView:self.view];
+                NSMutableDictionary *result = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
+                                               [NSString stringWithFormat:@"%d", (int)percentage]   , @"force",
+                                               [NSString stringWithFormat:@"%d", (int)coordinates.x], @"x",
+                                               [NSString stringWithFormat:@"%d", (int)coordinates.y], @"y",
+                                               // no need to use the touch.timestamp really since it's simply 'now'
+                                               [NSString stringWithFormat:@"%f", [[NSDate date] timeIntervalSince1970]], @"timestamp",
+                                               nil];
+
+                CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:result];
+                pluginResult.keepCallback = [NSNumber numberWithBool:YES];
+                [_commandDelegate sendPluginResult:pluginResult callbackId:_callbackId];
+            }
+        }
     }
-  }
 }
 @end