@capacitor/ios 2.2.1 → 2.4.2

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -24,6 +24,13 @@ public class CAPBridgeViewController: UIViewController, CAPBridgeDelegate, WKScr
   private var basePath: String = ""
   private let assetsFolder = "public"
   
+  private enum WebViewLoadingState {
+    case unloaded
+    case initialLoad(isOpaque: Bool)
+    case subsequentLoad
+  }
+  private var webViewLoadingState = WebViewLoadingState.unloaded
+  
   private var isStatusBarVisible = true
   private var statusBarStyle: UIStatusBarStyle = .default
   private var statusBarAnimation: UIStatusBarAnimation = .slide
@@ -97,7 +104,12 @@ public class CAPBridgeViewController: UIViewController, CAPBridgeDelegate, WKScr
     if let backgroundColor = (bridge!.config.getValue("ios.backgroundColor") as? String) ?? (bridge!.config.getValue("backgroundColor") as? String) {
       webView?.backgroundColor = UIColor(fromHex: backgroundColor)
       webView?.scrollView.backgroundColor = UIColor(fromHex: backgroundColor)
+    } else if #available(iOS 13, *) {
+      // Use the system background colors if background is not set by user
+      webView?.backgroundColor = UIColor.systemBackground
+      webView?.scrollView.backgroundColor = UIColor.systemBackground
     }
+    
     if let overrideUserAgent = (bridge!.config.getValue("ios.overrideUserAgent") as? String) ?? (bridge!.config.getValue("overrideUserAgent") as? String) {
       webView?.customUserAgent = overrideUserAgent
     }
@@ -173,6 +185,16 @@ public class CAPBridgeViewController: UIViewController, CAPBridgeDelegate, WKScr
   }
 
   func loadWebView() {
+    // Set the webview to be not opaque on the inital load. This prevents
+    // the webview from showing a white background, which is its default
+    // loading display, as that can appear as a screen flash. This might
+    // have already been set by something else, like a plugin, so we want
+    // to save the current value to reset it on success or failure.
+    if let webView = webView, case .unloaded = webViewLoadingState {
+      webViewLoadingState = .initialLoad(isOpaque: webView.isOpaque)
+      webView.isOpaque = false
+    }
+    
     let fullStartPath = URL(fileURLWithPath: assetsFolder).appendingPathComponent(startDir).appendingPathComponent("index")
     if Bundle.main.path(forResource: fullStartPath.relativePath, ofType: "html") == nil {
       fatalLoadError()
@@ -289,7 +311,9 @@ public class CAPBridgeViewController: UIViewController, CAPBridgeDelegate, WKScr
     }
 
     if navUrl.absoluteString.range(of: hostname!) == nil && (navigationAction.targetFrame == nil || (navigationAction.targetFrame?.isMainFrame)!) {
-      UIApplication.shared.open(navUrl, options: [:], completionHandler: nil)
+      if UIApplication.shared.applicationState == .active {
+        UIApplication.shared.open(navUrl, options: [:], completionHandler: nil)
+      }
       decisionHandler(.cancel)
       return
     }
@@ -298,10 +322,18 @@ public class CAPBridgeViewController: UIViewController, CAPBridgeDelegate, WKScr
   }
 
   public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+    if case .initialLoad(let isOpaque) = webViewLoadingState {
+      webView.isOpaque = isOpaque
+      webViewLoadingState = .subsequentLoad
+    }
     CAPLog.print("⚡️  WebView loaded")
   }
 
   public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+    if case .initialLoad(let isOpaque) = webViewLoadingState {
+      webView.isOpaque = isOpaque
+      webViewLoadingState = .subsequentLoad
+    }
     CAPLog.print("⚡️  WebView failed to load")
     CAPLog.print("⚡️  Error: " + error.localizedDescription)
   }

package/Capacitor/Capacitor/CAPPlugin.m

@@ -99,10 +99,13 @@
     }
     return;
   }
-  
-  for(CAPPluginCall *call in listenersForEvent) {
-    CAPPluginCallResult *result = [[CAPPluginCallResult alloc] init:data];
-    call.successHandler(result, call);
+
+  for (int i=0; i < listenersForEvent.count; i++) {
+    CAPPluginCall *call = listenersForEvent[i];
+    if (call != nil) {
+      CAPPluginCallResult *result = [[CAPPluginCallResult alloc] init:data];
+      call.successHandler(result, call);
+    }
   }
 }
 

package/Capacitor/Capacitor/Plugins/Camera.swift

@@ -29,6 +29,7 @@ struct CameraSettings {
   var height: Float = 0
   var resultType = "base64"
   var saveToGallery = false
+  var preserveAspectRatio = false
 }
 
 @objc(CAPCameraPlugin)
@@ -72,7 +73,8 @@ public class CAPCameraPlugin : CAPPlugin, UIImagePickerControllerDelegate, UINav
     settings.direction = CameraDirection(rawValue: call.getString("direction") ?? DEFAULT_DIRECTION.rawValue) ?? DEFAULT_DIRECTION
     settings.resultType = call.get("resultType", String.self, "base64")!
     settings.saveToGallery = call.get("saveToGallery", Bool.self, false)!
-    
+    settings.preserveAspectRatio = call.get("preserveAspectRatio", Bool.self, false)!
+
     // Get the new image dimensions if provided
     settings.width = Float(call.get("width", Int.self, 0)!)
     settings.height = Float(call.get("height", Int.self, 0)!)
@@ -229,7 +231,7 @@ public class CAPCameraPlugin : CAPPlugin, UIImagePickerControllerDelegate, UINav
     }
 
     if settings.shouldResize {
-      guard let convertedImage = resizeImage(image!) else {
+      guard let convertedImage = resizeImage(image!, settings.preserveAspectRatio) else {
         self.call?.error("Error resizing image")
         return
       }
@@ -312,7 +314,14 @@ public class CAPCameraPlugin : CAPPlugin, UIImagePickerControllerDelegate, UINav
     return meta
   }
 
-  func resizeImage(_ image: UIImage) -> UIImage? {
+  func resizeImage(_ image: UIImage, _ preserveAspectRatio: Bool) -> UIImage? {
+    if preserveAspectRatio {
+      return resizeImagePreservingAspectRatio(image)
+    }
+    return resizeImageWithoutPreservingAspectRatio(image)
+  }
+
+  func resizeImageWithoutPreservingAspectRatio(_ image: UIImage) -> UIImage? {
     let isAspectScale = settings.width > 0 && settings.height == 0 || settings.height > 0 && settings.width == 0
     let aspect = Float(image.size.width / image.size.height);
 
@@ -333,6 +342,31 @@ public class CAPCameraPlugin : CAPPlugin, UIImagePickerControllerDelegate, UINav
     return scaledImage
   }
 
+  func resizeImagePreservingAspectRatio(_ image: UIImage) -> UIImage? {
+    let imageHeight = Float(image.size.height)
+    let imageWidth = Float(image.size.width)
+
+    // 0 is treated as 'no restriction'
+    let maxHeight = settings.height == 0 ? imageHeight : settings.height
+    let maxWidth = settings.width == 0 ? imageWidth : settings.width
+
+    // resize with preserved aspect ratio
+    var newWidth = min(imageWidth, maxWidth)
+    var newHeight = (imageHeight * newWidth) / imageWidth
+    if newHeight > maxHeight {
+      newWidth = (imageWidth * maxHeight) / imageHeight
+      newHeight = maxHeight
+    }
+    let size = CGSize.init(width: Int(newWidth), height: Int(newHeight))
+
+    UIGraphicsBeginImageContextWithOptions(size, false, 1.0)
+    image.draw(in: CGRect(origin: CGPoint.zero, size: size))
+
+    let scaledImage = UIGraphicsGetImageFromCurrentImageContext()
+    UIGraphicsEndImageContext()
+    return scaledImage
+  }
+
   func makeExif(_ exif: [AnyHashable:Any]?) -> [AnyHashable:Any]? {
     return exif?["{Exif}"] as? [AnyHashable:Any]
   }

package/Capacitor/Capacitor/Plugins/Device.swift

@@ -26,6 +26,8 @@ public class CAPDevicePlugin: CAPPlugin {
       "osVersion": UIDevice.current.systemVersion,
       "appVersion": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "",
       "appBuild": Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "",
+      "appId": Bundle.main.infoDictionary?["CFBundleIdentifier"] as? String ?? "",
+      "appName": Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "",
       "platform": "ios",
       "manufacturer": "Apple",
       "uuid": UIDevice.current.identifierForVendor!.uuidString,

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin+Resources.h

@@ -0,0 +1,39 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+#import <UIKit/UIKit.h>
+#import "CDVPlugin.h"
+
+@interface CDVPlugin (CDVPluginResources)
+
+/*
+ This will return the localized string for a key in a .bundle that is named the same as your class
+ For example, if your plugin class was called Foo, and you have a Spanish localized strings file, it will
+ try to load the desired key from Foo.bundle/es.lproj/Localizable.strings
+ */
+- (NSString*)pluginLocalizedString:(NSString*)key;
+
+/*
+ This will return the image for a name in a .bundle that is named the same as your class
+ For example, if your plugin class was called Foo, and you have an image called "bar",
+ it will try to load the image from Foo.bundle/bar.png (and appropriately named retina versions)
+ */
+- (UIImage*)pluginImageResource:(NSString*)name;
+
+@end

package/CapacitorCordova/CapacitorCordova/Classes/Public/CDVPlugin+Resources.m

@@ -0,0 +1,38 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+#import "CDVPlugin+Resources.h"
+
+@implementation CDVPlugin (CDVPluginResources)
+
+- (NSString*)pluginLocalizedString:(NSString*)key
+{
+    NSBundle* bundle = [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:NSStringFromClass([self class]) ofType:@"bundle"]];
+
+    return [bundle localizedStringForKey:(key) value:nil table:nil];
+}
+
+- (UIImage*)pluginImageResource:(NSString*)name
+{
+    NSString* resourceIdentifier = [NSString stringWithFormat:@"%@.bundle/%@", NSStringFromClass([self class]), name];
+
+    return [UIImage imageNamed:resourceIdentifier];
+}
+
+@end

package/CapacitorCordova/CapacitorCordova.xcodeproj/project.pbxproj

@@ -25,6 +25,8 @@
 		2F856C00203DEB320047344A /* CDVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F856BFE203DEB320047344A /* CDVViewController.m */; };
 		2F8AC283217F3A20008C2C33 /* CDVURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F8AC281217F3A20008C2C33 /* CDVURLProtocol.m */; };
 		2F8AC284217F3A20008C2C33 /* CDVURLProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F8AC282217F3A20008C2C33 /* CDVURLProtocol.h */; };
+		2F92AB5224D9ABA000954A4A /* CDVPlugin+Resources.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F92AB5024D9ABA000954A4A /* CDVPlugin+Resources.m */; };
+		2F92AB5324D9ABA000954A4A /* CDVPlugin+Resources.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F92AB5124D9ABA000954A4A /* CDVPlugin+Resources.h */; };
 		2FAD9772203C77B9000D30F8 /* CDVConfigParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FAD9770203C77B8000D30F8 /* CDVConfigParser.h */; };
 		2FAD9773203C77B9000D30F8 /* CDVConfigParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FAD9771203C77B9000D30F8 /* CDVConfigParser.m */; };
 		2FE19E2A20473160002A4E89 /* AppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FE19E2820473160002A4E89 /* AppDelegate.h */; };
@@ -52,6 +54,8 @@
 		2F856BFE203DEB320047344A /* CDVViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVViewController.m; sourceTree = "<group>"; };
 		2F8AC281217F3A20008C2C33 /* CDVURLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVURLProtocol.m; sourceTree = "<group>"; };
 		2F8AC282217F3A20008C2C33 /* CDVURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVURLProtocol.h; sourceTree = "<group>"; };
+		2F92AB5024D9ABA000954A4A /* CDVPlugin+Resources.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CDVPlugin+Resources.m"; sourceTree = "<group>"; };
+		2F92AB5124D9ABA000954A4A /* CDVPlugin+Resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CDVPlugin+Resources.h"; sourceTree = "<group>"; };
 		2FAD9770203C77B8000D30F8 /* CDVConfigParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVConfigParser.h; sourceTree = "<group>"; };
 		2FAD9771203C77B9000D30F8 /* CDVConfigParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVConfigParser.m; sourceTree = "<group>"; };
 		2FE19E2820473160002A4E89 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -106,6 +110,8 @@
 		2F5C86E81FE94861004B09C7 /* Public */ = {
 			isa = PBXGroup;
 			children = (
+				2F92AB5124D9ABA000954A4A /* CDVPlugin+Resources.h */,
+				2F92AB5024D9ABA000954A4A /* CDVPlugin+Resources.m */,
 				2F8AC282217F3A20008C2C33 /* CDVURLProtocol.h */,
 				2F8AC281217F3A20008C2C33 /* CDVURLProtocol.m */,
 				2F4F657B2091F1FD00EAA994 /* NSDictionary+CordovaPreferences.h */,
@@ -147,6 +153,7 @@
 				2F5C87271FE98418004B09C7 /* CDVPlugin.h in Headers */,
 				2F856BFF203DEB320047344A /* CDVViewController.h in Headers */,
 				2F5C87231FE98418004B09C7 /* CDVCommandDelegateImpl.h in Headers */,
+				2F92AB5324D9ABA000954A4A /* CDVPlugin+Resources.h in Headers */,
 				2F8AC284217F3A20008C2C33 /* CDVURLProtocol.h in Headers */,
 				2F5C87241FE98418004B09C7 /* CDVInvokedUrlCommand.h in Headers */,
 				2FE19E2A20473160002A4E89 /* AppDelegate.h in Headers */,
@@ -226,6 +233,7 @@
 				2F5C871D1FE98418004B09C7 /* CDVPluginResult.m in Sources */,
 				2F4F657C2091F1FD00EAA994 /* NSDictionary+CordovaPreferences.m in Sources */,
 				2F5C87211FE98418004B09C7 /* CDVPlugin.m in Sources */,
+				2F92AB5224D9ABA000954A4A /* CDVPlugin+Resources.m in Sources */,
 				2FAD9773203C77B9000D30F8 /* CDVConfigParser.m in Sources */,
 				2F856C00203DEB320047344A /* CDVViewController.m in Sources */,
 				2F5C87201FE98418004B09C7 /* CDVInvokedUrlCommand.m in Sources */,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "2.2.1",
+  "version": "2.4.2",
   "description": "Capacitor: cross-platform mobile apps with the web",
   "homepage": "https://capacitor.ionicframework.com/",
   "author": "Ionic Team <hi@ionic.io> (https://ionicframework.com) ",
@@ -16,6 +16,6 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@capacitor/core": "~2.2.0"
+    "@capacitor/core": "~2.4.0"
   }
 }