Merge branch 'master' into TIMOB-27253

apidoc/Titanium/App/iOS/iOS.yml

@@ -486,6 +486,30 @@ properties:
     osver: {ios: {min: "11.0"}}
     since: "7.3.0"
 
+  - name: USER_INTERFACE_STYLE_UNSPECIFIED
+    summary: An unspecified interface style.
+    description: Used in the `userInterfaceStyle` property.
+    type: Number
+    permission: read-only
+    osver: {ios: {min: "13.0"}}
+    since: "8.2.0"
+
+  - name: USER_INTERFACE_STYLE_LIGHT
+    summary: A light interface style.
+    description: Used in the `userInterfaceStyle` property.
+    type: Number
+    permission: read-only
+    osver: {ios: {min: "13.0"}}
+    since: "8.2.0"
+
+  - name: USER_INTERFACE_STYLE_DARK
+    summary: A dark interface style.
+    description: Used in the `userInterfaceStyle` property.
+    type: Number
+    permission: read-only
+    osver: {ios: {min: "13.0"}}
+    since: "8.2.0"
+
   - name: UTTYPE_TEXT
     summary: |
         Uniform type identifier for all text types.
@@ -800,6 +824,16 @@ properties:
     osver: {ios: {min: "8.0"}}
     since: "3.4.0"
 
+  - name: userInterfaceStyle
+    summary: The style associated with the user interface.
+    description: |
+        Use this property to determine whether your interface should be configured with a dark or light appearance.
+        The default value of this trait is set to the corresponding appearance setting on the user's device.
+    type: Array<String>
+    permission: read-only
+    osver: {ios: {min: "13.0"}}
+    since: "8.2.0"
+
 events:
   - name: notification
     summary: Fired when a local notification is received by the application.
@@ -1360,6 +1394,11 @@ events:
     osver: {ios: {min: "8.0"}}
     since: "6.0.0"
 
+  - name: traitcollectionchange
+    summary: Fired when the trait collection of the device changes, e.g. the user interface style.
+    platforms: [iphone, ipad]
+    since: "8.2.0"
+
 ---
 name: NotificationParams
 summary: |

apidoc/Titanium/UI/Android/Android.yml

@@ -644,7 +644,7 @@ properties:
     summary: |
         Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to disable plugins in a web view.
     description: |
-        Content that requires a plugin, such as Flash Player, is not loaded, and any
+        Content that requires a plugin, is not loaded, and any
         alternative content is displayed instead.
     type: Number
     permission: read-only
@@ -653,15 +653,15 @@ properties:
     summary: |
         Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to enable plugins in a web view.
     description: |
-        Content that requires a plugin, such as Flash Player, is always loaded, whether or not a plugin is
+        Content that requires a plugin,, is always loaded, whether or not a plugin is
         available for the content.
     type: Number
     permission: read-only
 
   - name: WEBVIEW_PLUGINS_ON_DEMAND
     summary: Display a placeholder and only load plugins when user selects it.
     description: |
-        Content that requires a plugin, such as Flash Player, is replaced by a placeholder. When 
+        Content that requires a plugin, is replaced by a placeholder. When 
         the user clicks on the placeholder, the plugin is loaded and the content is displayed.
         
         Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to load plugins on demand.

build/lib/packager.js

@@ -10,8 +10,6 @@ const rollup = require('rollup').rollup;
 const babel = require('rollup-plugin-babel');
 const resolve = require('rollup-plugin-node-resolve');
 const commonjs = require('rollup-plugin-commonjs');
-const appc = require('node-appc');
-const version = appc.version;
 const packageJSON = require('../../package.json');
 const utils = require('./utils');
 const copyFile = utils.copyFile;
@@ -85,12 +83,12 @@ function determineBabelOptions() {
 	const chromeVersion = parseInt(found[1] + found[2]); // concat the first two numbers as string, then turn to int
 	// Now pull out min IOS target
 	// eslint-disable-next-line security/detect-non-literal-require
-	const minSupportedIosSdk = version.parseMin(require(path.join(ROOT_DIR, 'iphone/package.json')).vendorDependencies['ios sdk']);
+	const { minIosVersion } = require(path.join(ROOT_DIR, 'iphone/package.json'));
 	// TODO: filter to only targets relevant for platforms we're building?
 	const options = {
 		targets: {
 			chrome: chromeVersion,
-			ios: minSupportedIosSdk
+			ios: minIosVersion
 		},
 		useBuiltIns: 'entry',
 		// DO NOT include web polyfills!

build/scons-xcode-project-build.js

@@ -11,8 +11,6 @@ const rollup = require('rollup').rollup;
 const babel = require('rollup-plugin-babel');
 const resolve = require('rollup-plugin-node-resolve');
 const commonjs = require('rollup-plugin-commonjs');
-const appc = require('node-appc');
-const version = appc.version;
 
 program.parse(process.argv);
 
@@ -53,10 +51,10 @@ async function generateIndexJSON(dirToTraverse) {
 
 function determineBabelOptions() {
 	// eslint-disable-next-line security/detect-non-literal-require
-	const minSupportedIosSdk = version.parseMin(require(path.join(ROOT_DIR, 'iphone/package.json')).vendorDependencies['ios sdk']);
+	const { minIosVersion } = require(path.join(ROOT_DIR, 'iphone/package.json'));
 	const options = {
 		targets: {
-			ios: minSupportedIosSdk
+			ios: minIosVersion
 		},
 		useBuiltIns: 'entry',
 		// DO NOT include web polyfills!

iphone/Classes/GeolocationModule.m

@@ -316,10 +316,11 @@ - (CLLocationManager *)locationManager
 
     locationManager.allowsBackgroundLocationUpdates = allowsBackgroundLocationUpdates;
 
+#if IS_SDK_IOS_11
     if ([TiUtils isIOSVersionOrGreater:@"11.0"]) {
       locationManager.showsBackgroundLocationIndicator = showBackgroundLocationIndicator;
     }
-
+#endif
     locationManager.activityType = activityType;
     locationManager.pausesLocationUpdatesAutomatically = pauseLocationUpdateAutomatically;
 
@@ -603,19 +604,23 @@ - (void)setHeadingFilter:(CLLocationDegrees)value
 
 - (BOOL)showBackgroundLocationIndicator
 {
+#if IS_SDK_IOS_11
   if ([TiUtils isIOSVersionOrGreater:@"11.0"]) {
     return showBackgroundLocationIndicator;
   }
+#endif
   DebugLog(@"[ERROR] The showBackgroundLocationIndicator property is only available on iOS 11.0+. Returning \"false\" ...");
   return NO;
 }
 
 - (void)setShowBackgroundLocationIndicator:(BOOL)value
 {
+#if IS_SDK_IOS_11
   if ([TiUtils isIOSVersionOrGreater:@"11.0"]) {
     showBackgroundLocationIndicator = value;
     return;
   }
+#endif
   DebugLog(@"[ERROR] The showBackgroundLocationIndicator property is only available on iOS 11.0+. Ignoring call ...");
 }
 

iphone/Classes/TiAppiOSProxy.m

@@ -126,6 +126,13 @@ - (void)_listenerAdded:(NSString *)type count:(int)count
                                                  name:kTiApplicationLaunchedFromURL
                                                object:nil];
   }
+
+  if ((count == 1) && [type isEqual:@"traitcollectionchange"]) {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(didChangeTraitCollection:)
+                                                 name:kTiTraitCollectionChanged
+                                               object:nil];
+  }
 }
 
 - (void)_listenerRemoved:(NSString *)type count:(int)count
@@ -179,10 +186,25 @@ - (void)_listenerRemoved:(NSString *)type count:(int)count
   if ((count == 1) && [type isEqual:@"shortcutitemclick"]) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiApplicationShortcut object:nil];
   }
+  if ((count == 1) && [type isEqual:@"traitcollectionchange"]) {
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kTiTraitCollectionChanged object:nil];
+  }
 }
 
 #pragma mark Public
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+- (NSNumber *)userInterfaceStyle
+{
+  return @(TiApp.controller.traitCollection.userInterfaceStyle);
+}
+#endif
+
+- (void)didChangeTraitCollection:(NSNotification *)info
+{
+  [self fireEvent:@"traitcollectionchange"];
+}
+
 - (void)didReceiveApplicationShortcutNotification:(NSNotification *)info
 {
   NSMutableDictionary *event = [[NSMutableDictionary alloc] initWithDictionary:@{
@@ -1267,6 +1289,35 @@ - (NSNumber *)USER_NOTIFICATION_CATEGORY_OPTION_HIDDEN_PREVIEWS_SHOW_SUBTITLE
   return NUMINT(0);
 }
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+- (NSNumber *)USER_INTERFACE_STYLE_UNSPECIFIED
+{
+  if ([TiUtils isIOSVersionOrGreater:@"13.0"]) {
+    return NUMINT(UIUserInterfaceStyleUnspecified);
+  }
+
+  return NUMINT(0);
+}
+
+- (NSNumber *)USER_INTERFACE_STYLE_LIGHT
+{
+  if ([TiUtils isIOSVersionOrGreater:@"13.0"]) {
+    return NUMINT(UIUserInterfaceStyleLight);
+  }
+
+  return NUMINT(0);
+}
+
+- (NSNumber *)USER_INTERFACE_STYLE_DARK
+{
+  if ([TiUtils isIOSVersionOrGreater:@"13.0"]) {
+    return NUMINT(UIUserInterfaceStyleDark);
+  }
+
+  return NUMINT(0);
+}
+#endif
+
 #pragma mark UTI Text Type Constants
 
 - (CFStringRef)UTTYPE_TEXT

iphone/Classes/TiAppiOSUserNotificationCenterProxy.m

@@ -178,9 +178,11 @@ - (void)requestUserNotificationSettings:(id)callback
         @"carPlaySetting" : @([settings carPlaySetting]),
         @"alertStyle" : @([settings alertStyle])
       } mutableCopy];
+#if IS_SDK_IOS_11
       if ([TiUtils isIOSVersionOrGreater:@"11.0"]) {
         propertiesDict[@"showPreviewsSetting"] = @([settings showPreviewsSetting]);
       }
+#endif
 #if IS_SDK_IOS_12
       if ([TiUtils isIOSVersionOrGreater:@"12.0"]) {
         propertiesDict[@"criticalAlertSetting"] = @([settings criticalAlertSetting]);

iphone/Classes/TiUIActivityIndicator.m

@@ -187,7 +187,11 @@ - (void)setColor_:(id)value
   textColor = [newColor retain];
   if (messageLabel != nil) {
     if (textColor == nil) {
-      [messageLabel setTextColor:[UIColor blackColor]];
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+      [messageLabel setTextColor:[TiUtils isIOSVersionOrGreater:@"13.0"] ? UIColor.labelColor : UIColor.blackColor];
+#else
+      [messageLabel setTextColor:UIColor.blackColor];
+#endif
     } else {
       [messageLabel setTextColor:textColor];
     }

iphone/Classes/TiUIListItem.m

@@ -252,6 +252,10 @@ - (void)setPosition:(int)position isGrouped:(BOOL)grouped
 
 - (void)applyBackgroundWithSelectedColor:(id)selectedBackgroundColor selectedImage:(id)selectedBackgroundImage
 {
+  if (!selectedBackgroundColor && !selectedBackgroundImage) {
+    return; // Ignore custom selection styles for native selections
+  }
+
   UIColor *sbgColor = (selectedBackgroundColor != nil) ? ([[TiUtils colorValue:selectedBackgroundColor] _color]) : nil;
   UIImage *sbgImage = [[ImageLoader sharedLoader] loadImmediateStretchableImage:[TiUtils toURL:selectedBackgroundImage proxy:_proxy] withLeftCap:TiDimensionAuto topCap:TiDimensionAuto];
   if (sbgImage != nil) {

iphone/Classes/TiUIListView.m

@@ -2198,6 +2198,7 @@ - (void)viewResignFocus
 
 - (void)viewGetFocus
 {
+#if IS_SDK_IOS_11
   if (isSearchBarInNavigation) {
     id proxy = [(TiViewProxy *)self.proxy parent];
     while ([proxy isKindOfClass:[TiViewProxy class]] && ![proxy isKindOfClass:[TiWindowProxy class]]) {
@@ -2213,6 +2214,7 @@ - (void)viewGetFocus
       controller.navigationItem.searchController = searchController;
     }
   }
+#endif
 
   if (isSearched && self.searchedString && ![searchController isActive]) {
     isSearched = NO;

iphone/Classes/TiUINavigationWindowProxy.m

@@ -213,7 +213,9 @@ - (void)navigationController:(UINavigationController *)navigationController will
     }
   }
   TiWindowProxy *theWindow = (TiWindowProxy *)[(TiViewController *)viewController proxy];
+#if IS_SDK_IOS_11
   [theWindow processForSafeArea];
+#endif
   if ((theWindow != rootWindow) && [theWindow opening]) {
     [theWindow windowWillOpen];
     [theWindow windowDidOpen];
@@ -384,6 +386,7 @@ - (void)viewDidDisappear:(BOOL)animated
   [super viewDidDisappear:animated];
 }
 
+#if IS_SDK_IOS_11
 - (BOOL)homeIndicatorAutoHide
 {
   UIViewController *topVC = [navController topViewController];
@@ -395,6 +398,7 @@ - (BOOL)homeIndicatorAutoHide
   }
   return [super homeIndicatorAutoHide];
 }
+#endif
 
 - (BOOL)hidesStatusBar
 {

iphone/Classes/TiUIPicker.m

@@ -79,7 +79,11 @@ - (UIControl *)picker
       [(UIDatePicker *)picker setDatePickerMode:type];
       [picker addTarget:self action:@selector(valueChanged:) forControlEvents:UIControlEventValueChanged];
     }
-    [picker setBackgroundColor:[UIColor whiteColor]];
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+    [picker setBackgroundColor:[TiUtils isIOSVersionOrGreater:@"13.0"] ? UIColor.systemBackgroundColor : UIColor.whiteColor];
+#else
+    [picker setBackgroundColor:UIColor.whiteColor];
+#endif
     [self addSubview:picker];
   }
   return picker;

iphone/Classes/TiUIScrollView.m

@@ -147,6 +147,7 @@ - (TiUIScrollViewImpl *)scrollView
 
 - (void)adjustScrollViewInsets
 {
+#if IS_SDK_IOS_11
   id viewProxy = self.proxy;
   while (viewProxy && ![viewProxy isKindOfClass:[TiWindowProxy class]]) {
     viewProxy = [viewProxy parent];
@@ -159,6 +160,7 @@ - (void)adjustScrollViewInsets
       [scrollView setContentInsetAdjustmentBehavior:UIScrollViewContentInsetAdjustmentNever];
     }
   }
+#endif
 }
 
 - (id)accessibilityElement

iphone/Classes/TiUITabGroupProxy.m

@@ -267,6 +267,7 @@ - (UIStatusBarStyle)preferredStatusBarStyle;
   return [super preferredStatusBarStyle];
 }
 
+#if IS_SDK_IOS_11
 - (BOOL)homeIndicatorAutoHide
 {
   UITabBarController *tabController = [(TiUITabGroup *)[self view] tabController];
@@ -276,6 +277,7 @@ - (BOOL)homeIndicatorAutoHide
   }
   return [super homeIndicatorAutoHide];
 }
+#endif
 
 - (BOOL)hidesStatusBar
 {