#33 iOS 10 updates

Author: EddyVerbruggen

README.md

@@ -39,7 +39,8 @@ This one has a custom `tintColor` (check the buttons):
 
 <img src="screenshots/07-tintColor.PNG" width="350"/>
 
-On iOS 10, you can use `barColor` and `tintColor`:
+On iOS 10, you can use `barColor` and `controlTintColor` as well
+(to make sure iOS 9 buttons are not white in the case, pass in a `tintColor` as well):
 
 <img src="screenshots/08-barColor.PNG" width="350"/>
 
@@ -74,8 +75,9 @@ function openUrl(url, readerMode) {
             animated: false, // default true, note that 'hide' will reuse this preference (the 'Done' button will always animate though)
             transition: 'curl', // (this only works in iOS 9.1/9.2 and lower) unless animated is false you can choose from: curl, flip, fade, slide (default)
             enterReaderModeIfAvailable: readerMode, // default false
-            barColor: "#0000ff", // default is white (iOS 10 only)
-            tintColor: "#ffffff" // default is ios blue
+            tintColor: "#00ffff", // default is ios blue
+            barColor: "#0000ff", // on iOS 10+ you can change the background color as well
+            controlTintColor: "#ffffff" // on iOS 10+ you can override the default tintColor
           },
           // this success handler will be invoked for the lifecycle events 'opened', 'loaded' and 'closed'
           function(result) {

src/ios/SafariViewController.m

@@ -51,20 +51,35 @@ - (void) show:(CDVInvokedUrlCommand*)command {
   }
 
   NSString *tintColor = options[@"tintColor"];
+  NSString *controlTintColor = options[@"controlTintColor"];
+  NSString *barColor = options[@"barColor"];
+
+  // if only tintColor is set, use that as the controlTintColor for iOS 10
+  if (barColor == nil && controlTintColor == nil) {
+    controlTintColor = tintColor;
+  } else if (tintColor == nil) {
+    tintColor = controlTintColor;
+  }
+
   if (tintColor != nil) {
-    #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000 // iOS 10.0 supported
-      vc.preferredControlTintColor = [self colorFromHexString:options[@"tintColor"]];
-    #else
-      vc.view.tintColor = [self colorFromHexString:options[@"tintColor"]];
-    #endif
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 // iOS 10.0 supported (compile time)
+    if (IsAtLeastiOSVersion(@"10")) { // iOS 10.0 supported (runtime)
+      vc.preferredControlTintColor = [self colorFromHexString:controlTintColor];
+    } else {
+      vc.view.tintColor = [self colorFromHexString:tintColor];
+    }
+#else
+    vc.view.tintColor = [self colorFromHexString:tintColor];
+#endif
   }
 
-  NSString *barColor = options[@"barColor"];
-  if (barColor != nil) {
-    #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000 // iOS 10.0 supported
-      vc.preferredBarTintColor = [self colorFromHexString:options[@"barColor"]];
-    #endif
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 // iOS 10.0 supported
+  if (IsAtLeastiOSVersion(@"10")) { // iOS 10.0 supported (runtime)
+    if (barColor != nil) {
+      vc.preferredBarTintColor = [self colorFromHexString:barColor];
+    }
   }
+#endif
 
   CDVPluginResult * pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:@{@"event":@"opened"}];
   [pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];