Merge branch 'master' of github.com:appcelerator/titanium_mobile into…

… pr-11294

apidoc/Titanium/UI/ButtonBar.yml

@@ -76,6 +76,31 @@ properties:
             </Alloy>
     type: [Array<String>, Array<BarItemType>]
 
+  - name: textColor
+    summary: Color of title of button, as a color name or hex triplet.
+    description: |
+        For information about color values, see the "Colors" section of <Titanium.UI>.
+    type: String
+    platforms: [iphone, ipad]
+    since: "9.0.0"
+
+  - name: selectedTextColor
+    summary: Color of title of button when it is selected, as a color name or hex triplet.
+    description: |
+        For information about color values, see the "Colors" section of <Titanium.UI>.
+    type: String
+    platforms: [iphone, ipad]
+    since: "9.0.0"
+
+  - name: selectedButtonColor
+    summary: Color of selected button, as a color name or hex triplet.
+    description: |
+        For information about color values, see the "Colors" section of <Titanium.UI>.
+    type: String
+    platforms: [iphone, ipad]
+    since: "9.0.0"
+    osver: {ios: {min: "13.0"}}
+
 examples:
   - title: Simple 3 button button bar
     example: |

apidoc/Titanium/UI/WebView.yml

@@ -452,6 +452,12 @@ events:
         constants: Titanium.UI.iOS.WEBVIEW_NAVIGATIONTYPE_*
         platforms: [ipad, iphone]
 
+      - name: isMainFrame
+        summary: Indicate if the event was generated from the main page or an iframe.
+        type: Boolean
+        platforms: [ipad, iphone]
+        since: "9.0.0"
+
   - name: error
     summary: Fired when the web view cannot load the content.
     description: |

iphone/Classes/TiUIButtonBar.m

@@ -59,6 +59,42 @@ - (id)accessibilityElement
   return [self segmentedControl];
 }
 
+- (UIColor *)reverseColorOf:(UIColor *)oldColor
+{
+  CGColorRef oldCGColor = oldColor.CGColor;
+
+  int numberOfComponents = CGColorGetNumberOfComponents(oldCGColor);
+  // can not invert - the only component is the alpha
+  if (numberOfComponents == 1) {
+    return [UIColor colorWithCGColor:oldCGColor];
+  }
+
+  const CGFloat *oldComponentColors = CGColorGetComponents(oldCGColor);
+  CGFloat newComponentColors[numberOfComponents];
+
+  int i = numberOfComponents - 1;
+  newComponentColors[i] = oldComponentColors[i]; // alpha
+  while (--i >= 0) {
+    newComponentColors[i] = 1 - oldComponentColors[i];
+  }
+
+  CGColorRef newCGColor = CGColorCreate(CGColorGetColorSpace(oldCGColor), newComponentColors);
+  UIColor *newColor = [UIColor colorWithCGColor:newCGColor];
+  CGColorRelease(newCGColor);
+
+  //For the GRAY colors 'Middle level colors'
+  CGFloat white = 0;
+  [oldColor getWhite:&white alpha:nil];
+
+  if (white > 0.3 && white < 0.67) {
+    if (white >= 0.5)
+      newColor = [UIColor darkGrayColor];
+    else if (white < 0.5)
+      newColor = [UIColor blackColor];
+  }
+  return newColor;
+}
+
 // For regression #1880.  Because there are essentially TWO kinds of 'width' going on with tabbed/button bars
 // (width of all elements, width of the proxy) we assume that if the user has set the width of the bar completely,
 // AND the width of the proxy is undefined, they want magic!
@@ -84,12 +120,53 @@ - (void)setTabbedBar:(BOOL)newIsTabbed;
   [[self segmentedControl] setMomentary:!newIsTabbed];
 }
 
+- (void)setTintColor_:(id)value
+{
+  UIColor *color = [[TiUtils colorValue:value] color];
+
+  if ([TiUtils isIOSVersionLower:@"13.0"]) {
+    [[self segmentedControl] setTintColor:color];
+    return;
+  }
+
+  UIColor *newColor = [self reverseColorOf:color];
+  [[self segmentedControl] setTitleTextAttributes:@{ NSForegroundColorAttributeName : color } forState:UIControlStateNormal];
+  [[self segmentedControl] setTitleTextAttributes:@{ NSForegroundColorAttributeName : newColor } forState:UIControlStateSelected];
+
+  [[self segmentedControl] setSelectedSegmentTintColor:color];
+}
+
 - (void)setBackgroundColor_:(id)value
 {
   TiColor *color = [TiUtils colorValue:value];
-  [[self segmentedControl] setTintColor:[color _color]];
+  [[self segmentedControl] setBackgroundColor:[color _color]];
 }
 
+- (void)setTextColor_:(id)value
+{
+  UIColor *color = [[TiUtils colorValue:value] color];
+
+  [[self segmentedControl] setTitleTextAttributes:@{ NSForegroundColorAttributeName : color } forState:UIControlStateNormal];
+}
+
+- (void)setSelectedTextColor_:(id)value
+{
+  UIColor *color = [[TiUtils colorValue:value] color];
+
+  [[self segmentedControl] setTitleTextAttributes:@{ NSForegroundColorAttributeName : color } forState:UIControlStateSelected];
+}
+
+#if IS_SDK_IOS_13
+- (void)setSelectedButtonColor_:(id)value
+{
+  if (![TiUtils isIOSVersionOrGreater:@"13.0"]) {
+    return;
+  }
+  UIColor *color = [[TiUtils colorValue:value] color];
+  [[self segmentedControl] setSelectedSegmentTintColor:color];
+}
+#endif
+
 - (void)setIndex_:(id)value
 {
   selectedIndex = [TiUtils intValue:value def:-1];

iphone/Classes/TiUIWebView.m

@@ -979,6 +979,18 @@ - (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSSt
   [[TiApp app] showModalController:alertController animated:YES];
 }
 
+- (void)fireBeforeLoad:(nonnull WKNavigationAction *)navigationAction
+{
+  if ([[self proxy] _hasListeners:@"beforeload"]) {
+    [[self proxy] fireEvent:@"beforeload"
+                 withObject:@{
+                   @"url" : navigationAction.request.URL.absoluteString,
+                   @"navigationType" : @(navigationAction.navigationType),
+                   @"isMainFrame" : NUMBOOL(navigationAction.targetFrame.isMainFrame),
+                 }];
+  }
+}
+
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(nonnull WKNavigationAction *)navigationAction decisionHandler:(nonnull void (^)(WKNavigationActionPolicy))decisionHandler
 {
   if (_isViewDetached) {
@@ -1008,20 +1020,13 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(nonnull WK
     }
   }
 
-  if ([[self proxy] _hasListeners:@"beforeload"]) {
-    [[self proxy] fireEvent:@"beforeload"
-                 withObject:@{
-                   @"url" : navigationAction.request.URL.absoluteString,
-                   @"navigationType" : @(navigationAction.navigationType)
-                 }];
-  }
-
   // Use "onlink" callback property to decide the navigation policy
   KrollWrapper *onLink = [[self proxy] valueForKey:@"onlink"];
-  if (onLink != nil) {
+  if (onLink != nil && navigationAction.navigationType == WKNavigationTypeLinkActivated) {
     JSValueRef functionResult = [onLink executeWithArguments:@[ @{ @"url" : navigationAction.request.URL.absoluteString } ]];
     if (functionResult != NULL && JSValueIsBoolean([onLink.bridge.krollContext context], functionResult)) {
       if (JSValueToBoolean([onLink.bridge.krollContext context], functionResult)) {
+        [self fireBeforeLoad:navigationAction];
         decisionHandler(WKNavigationActionPolicyAllow);
       } else {
         decisionHandler(WKNavigationActionPolicyCancel);
@@ -1030,6 +1035,8 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(nonnull WK
     }
   }
 
+  [self fireBeforeLoad:navigationAction];
+
   NSString *scheme = [navigationAction.request.URL.scheme lowercaseString];
 
   if ([allowedURLSchemes containsObject:navigationAction.request.URL.scheme]) {

iphone/TitaniumKit/TitaniumKit/Sources/API/ObjcProxy.h

@@ -118,6 +118,7 @@ JSExportAs(fireEvent,
   @deprecated Only here for backwards compatibility with SDK < 8.1.0. Use `init` instead.
  */
 - (id)_initWithPageContext:(id<TiEvaluator>)context __attribute__((deprecated));
+- (id)_initWithPageContext:(id<TiEvaluator>)context args:(NSArray *)args __attribute__((deprecated));
 
 // hooks for when an event listener gets added/removed
 - (void)_listenerAdded:(NSString *)type count:(int)count;

iphone/TitaniumKit/TitaniumKit/Sources/API/ObjcProxy.m

@@ -16,10 +16,17 @@ @implementation ObjcProxy
 + (JSValue *)createError:(NSString *)reason subreason:(NSString *)subreason location:(NSString *)location inContext:(JSContext *)context
 {
   NSString *exceptionName = @"org.appcelerator";
-  NSDictionary *details = @{
-    kTiExceptionSubreason : subreason,
-    kTiExceptionLocation : location
-  };
+  NSDictionary *details;
+  if (subreason != nil) {
+    details = @{
+      kTiExceptionSubreason : subreason,
+      kTiExceptionLocation : location
+    };
+  } else {
+    details = @{
+      kTiExceptionLocation : location
+    };
+  }
   NSException *exc = [NSException exceptionWithName:exceptionName reason:reason userInfo:details];
   JSGlobalContextRef jsContext = [context JSGlobalContextRef];
   JSValueRef jsValueRef = TiBindingTiValueFromNSObject(jsContext, exc);
@@ -29,10 +36,17 @@ + (JSValue *)createError:(NSString *)reason subreason:(NSString *)subreason loca
 - (JSValue *)createError:(NSString *)reason subreason:(NSString *)subreason location:(NSString *)location inContext:(JSContext *)context
 {
   NSString *exceptionName = [@"org.appcelerator." stringByAppendingString:NSStringFromClass([self class])];
-  NSDictionary *details = @{
-    kTiExceptionSubreason : subreason,
-    kTiExceptionLocation : location
-  };
+  NSDictionary *details;
+  if (subreason != nil) {
+    details = @{
+      kTiExceptionSubreason : subreason,
+      kTiExceptionLocation : location
+    };
+  } else {
+    details = @{
+      kTiExceptionLocation : location
+    };
+  }
   NSException *exc = [NSException exceptionWithName:exceptionName reason:reason userInfo:details];
   JSGlobalContextRef jsContext = [context JSGlobalContextRef];
   JSValueRef jsValueRef = TiBindingTiValueFromNSObject(jsContext, exc);
@@ -98,6 +112,38 @@ - (id)_initWithPageContext:(id<TiEvaluator>)context
   return [self init];
 }
 
+- (id)_initWithPageContext:(id<TiEvaluator>)context_ args:(NSArray *)args
+{
+  if (self = [self _initWithPageContext:context_]) {
+    NSDictionary *a = nil;
+    NSUInteger count = [args count];
+    if (count > 0 && [[args objectAtIndex:0] isKindOfClass:[NSDictionary class]]) {
+      a = [args objectAtIndex:0];
+    }
+
+    // If we're being created by an old proxy/module but we're a new-style obj-c proxy
+    // we need to handle assigning the properties object passed into the constructor
+    if (a != nil) {
+      // Get the JS object corresponding to "this" proxy
+      // Note that [JSContext currentContext] is nil, so we need to hack and get the global context
+      // TODO: Can we hack in a nice method that gets current context if available, falls back to global context?
+      // Because a lot of the code in the proxy base class assumes current context is not nil
+      KrollContext *krollContext = [context_ krollContext];
+      JSGlobalContextRef ref = krollContext.context;
+      JSValueRef jsValueRef = TiBindingTiValueFromNSObject(ref, self);
+      JSContext *context = [JSContext contextWithJSGlobalContextRef:ref];
+      JSValue *this = [JSValue valueWithJSValueRef:jsValueRef inContext:context];
+
+      // Go through the key/value pairs and set them on "this"
+      for (NSString *key in a) {
+        id value = a[key];
+        this[key] = value;
+      }
+    }
+  }
+  return self;
+}
+
 - (NSURL *)_baseURL
 {
   return baseURL;
@@ -206,7 +252,7 @@ - (void)fireEvent:(NSString *)name withDict:(NSDictionary *)dict
     // FIXME: looks like we need to handle bubble logic/etc. See other fireEvent impl
     for (JSManagedValue *storedCallback in listenersForType) {
       JSValue *function = [storedCallback value];
-      [function callWithArguments:@[ dict ]];
+      [self _fireEventToListener:name withObject:dict listener:function];
     }
   }
   @finally {

iphone/TitaniumKit/TitaniumKit/Sources/API/TiApp.h

@@ -137,7 +137,7 @@ TI_INLINE void waitForMemoryPanicCleared() //WARNING: This must never be run on
 /**
  Returns singleton instance of TiApp application object.
  */
-+ (TiApp *)app;
++ (TiApp *)app NS_SWIFT_NAME(sharedApp());
 
 /**
  * Returns a read-only dictionary from tiapp.xml properties

iphone/cli/commands/_build.js

@@ -6017,7 +6017,7 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
 							resourcesDir: this.xcodeAppDir,
 							logger: this.logger,
 							targets: {
-								ios: this.minSupportedIosSdk
+								ios: this.minIosVersion
 							}
 						}
 					});

package.json

@@ -156,7 +156,7 @@
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "ssri": "^7.1.0",
-    "titanium-docgen": "^0.2.0"
+    "titanium-docgen": "^4.0.0"
   },
   "repository": {
     "type": "git",