chore(ios): prevent modal windows from being swiped down

apidoc/Titanium/UI/Window.yml

@@ -1843,6 +1843,16 @@ properties:
     type: Boolean
     default: false
 
+  - name: forceModal
+    summary: Indicates whether the window enforces modal behaviour.
+    description: |
+        Set to `true` to prevent interactive dismissal of window while it is onscreen.
+    type: Boolean
+    default: false
+    platforms: [iphone, ipad]
+    since: "8.2.0"
+    osver: {ios: {min: "13.0"}}
+
   - name: modalStyle
     summary: Presentation style of this modal window.
     platforms: [iphone, ipad]

iphone/Classes/GeolocationModule.m

@@ -316,11 +316,9 @@ - (CLLocationManager *)locationManager
 
     locationManager.allowsBackgroundLocationUpdates = allowsBackgroundLocationUpdates;
 
-#if IS_XCODE_9
     if ([TiUtils isIOSVersionOrGreater:@"11.0"]) {
       locationManager.showsBackgroundLocationIndicator = showBackgroundLocationIndicator;
     }
-#endif
 
     locationManager.activityType = activityType;
     locationManager.pausesLocationUpdatesAutomatically = pauseLocationUpdateAutomatically;
@@ -605,23 +603,19 @@ - (void)setHeadingFilter:(CLLocationDegrees)value
 
 - (BOOL)showBackgroundLocationIndicator
 {
-#if IS_XCODE_9
   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_XCODE_9
   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/TiAppiOSUserNotificationCenterProxy.m

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

iphone/Classes/TiUIListView.m

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

iphone/Classes/TiUINavigationWindowProxy.m

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

iphone/Classes/TiUIScrollView.m

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

iphone/Classes/TiUITabGroupProxy.m

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

iphone/Classes/TiUITabProxy.m

@@ -256,9 +256,7 @@ - (void)openWindow:(NSArray *)args
   TiWindowProxy *window = [args objectAtIndex:0];
   ENSURE_TYPE(window, TiWindowProxy);
 
-#if IS_XCODE_9
   [window processForSafeArea];
-#endif
 
   if (window == rootWindow) {
     [rootWindow windowWillOpen];
@@ -385,9 +383,7 @@ - (void)handleWillShowViewController:(UIViewController *)viewController animated
     }
   }
   TiWindowProxy *theWindow = (TiWindowProxy *)[(TiViewController *)viewController proxy];
-#if IS_XCODE_9
   [theWindow processForSafeArea];
-#endif
   if (theWindow == rootWindow) {
     //This is probably too late for the root view controller.
     //Figure out how to call open before this callback
@@ -742,7 +738,6 @@ - (void)popToRootWindow:(id)args
 
 @synthesize parentOrientationController;
 
-#if IS_XCODE_9
 - (BOOL)homeIndicatorAutoHide
 {
   if (rootWindow == nil) {
@@ -759,7 +754,6 @@ - (BOOL)homeIndicatorAutoHide
   }
   return NO;
 }
-#endif
 
 - (BOOL)hidesStatusBar
 {

iphone/Classes/TiUITableView.m

@@ -2355,7 +2355,6 @@ - (void)viewResignFocus
 
 - (void)viewGetFocus
 {
-#if IS_XCODE_9
   if (isSearchBarInNavigation) {
     id proxy = [(TiViewProxy *)self.proxy parent];
     while ([proxy isKindOfClass:[TiViewProxy class]] && ![proxy isKindOfClass:[TiWindowProxy class]]) {
@@ -2371,7 +2370,6 @@ - (void)viewGetFocus
       controller.navigationItem.searchController = searchController;
     }
   }
-#endif
   if (!hideOnSearch && isSearched && self.searchedString && ![searchController isActive]) {
     isSearched = NO;
     searchController.searchBar.text = self.searchedString;

iphone/Classes/TiUIWebView.h

@@ -39,13 +39,11 @@
 
 @end
 
-#if IS_XCODE_9
 @interface WebAppProtocolHandler : NSObject <WKURLSchemeHandler> {
 }
 
 + (NSString *)specialProtocolScheme;
 
 @end
-#endif
 
 #endif

iphone/Classes/TiUIWebView.m

@@ -76,13 +76,11 @@ - (WKWebView *)webView
 
     [config setUserContentController:controller];
 
-#if IS_XCODE_9
     if ([TiUtils isIOSVersionOrGreater:@"11.0"]) {
       if (![WKWebView handlesURLScheme:[WebAppProtocolHandler specialProtocolScheme]]) {
         [config setURLSchemeHandler:[[WebAppProtocolHandler alloc] init] forURLScheme:[WebAppProtocolHandler specialProtocolScheme]];
       }
     }
-#endif
 
     _willHandleTouches = [TiUtils boolValue:[[self proxy] valueForKey:@"willHandleTouches"] def:YES];
 
@@ -1358,8 +1356,6 @@ - (NSHTTPCookie *)cookieForString:(NSString *)cookieStr
 
 @end
 
-#if IS_XCODE_9
-
 @implementation WebAppProtocolHandler
 
 + (NSString *)specialProtocolScheme
@@ -1410,6 +1406,5 @@ - (void)webView:(nonnull WKWebView *)webView stopURLSchemeTask:(nonnull id<WKURL
 }
 
 @end
-#endif
 
 #endif

iphone/Classes/TiUIiOSProxy.h

@@ -162,11 +162,9 @@
 @property (nonatomic, readonly) NSNumber *BLUR_EFFECT_STYLE_DARK;
 #endif
 
-#if IS_XCODE_9
 @property (nonatomic, readonly) NSNumber *LARGE_TITLE_DISPLAY_MODE_AUTOMATIC;
 @property (nonatomic, readonly) NSNumber *LARGE_TITLE_DISPLAY_MODE_ALWAYS;
 @property (nonatomic, readonly) NSNumber *LARGE_TITLE_DISPLAY_MODE_NEVER;
-#endif
 
 /**
     Checks the force touch capibility of the current device.

iphone/Classes/TiUIiOSProxy.m

@@ -800,11 +800,9 @@ - (id)createFeedbackGenerator:(id)args
 MAKE_SYSTEM_PROP(FEEDBACK_GENERATOR_IMPACT_STYLE_HEAVY, UIImpactFeedbackStyleHeavy);
 #endif
 
-#if IS_XCODE_9
 MAKE_SYSTEM_PROP(LARGE_TITLE_DISPLAY_MODE_AUTOMATIC, UINavigationItemLargeTitleDisplayModeAutomatic);
 MAKE_SYSTEM_PROP(LARGE_TITLE_DISPLAY_MODE_ALWAYS, UINavigationItemLargeTitleDisplayModeAlways);
 MAKE_SYSTEM_PROP(LARGE_TITLE_DISPLAY_MODE_NEVER, UINavigationItemLargeTitleDisplayModeNever);
-#endif
 
 #ifdef USE_TI_UIWEBVIEW
 

iphone/Classes/TiUIiOSSplitWindow.m

@@ -256,10 +256,8 @@ - (void)setMasterView_:(id)args
   RELEASE_TO_NIL(masterProxy);
   masterProxy = [args retain];
 
-#if IS_XCODE_9
   TiWindowProxy *masterWindowProxy = (TiWindowProxy *)masterProxy;
   masterWindowProxy.isMasterWindow = YES;
-#endif
 
   if (viewsInitialized) {
     [self initProxy:masterProxy withWrapper:masterViewWrapper];
@@ -282,10 +280,8 @@ - (void)setDetailView_:(id)args
   RELEASE_TO_NIL(detailProxy);
   detailProxy = [args retain];
 
-#if IS_XCODE_9
   TiWindowProxy *detailWindowProxy = (TiWindowProxy *)detailProxy;
   detailWindowProxy.isDetailWindow = YES;
-#endif
 
   if (viewsInitialized) {
     [self initProxy:detailProxy withWrapper:detailViewWrapper];

iphone/Classes/UIModule.m

@@ -635,10 +635,9 @@ - (NSNumber *)ATTRIBUTE_LINE_BREAK_BY_TRUNCATING_MIDDLE
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_URL, UITextContentTypeURL);
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_CARD_NUMBER, UITextContentTypeCreditCardNumber);
 
-#if IS_XCODE_9
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_USERNAME, UITextContentTypeUsername);
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_PASSWORD, UITextContentTypePassword);
-#endif
+
 #if IS_XCODE_10
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_NEW_PASSWORD, UITextContentTypeNewPassword);
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_ONE_TIME_CODE, UITextContentTypeOneTimeCode);

iphone/TitaniumKit/TitaniumKit/Sources/API/TiWindowProxy.h

@@ -21,6 +21,7 @@
   BOOL focussed;
   BOOL isModal;
   BOOL hidesStatusBar;
+  BOOL isForceModalDisable;
   UIStatusBarStyle barStyle;
   TiViewProxy<TiTab> *tab;
   TiAnimation *openAnimation;

iphone/TitaniumKit/TitaniumKit/Sources/API/TiWindowProxy.m

@@ -558,6 +558,13 @@ - (void)openOnUIThread:(NSArray *)args
           [theController setModalPresentationStyle:style];
         }
       }
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+      if ([TiUtils isIOSVersionOrGreater:@"13.0"]) {
+        isForceModalDisable = ![TiUtils boolValue:@"forceModal" properties:dict def:NO];
+        theController.modalInPresentation = !isForceModalDisable;
+      }
+#endif
       BOOL animated = [TiUtils boolValue:@"animated" properties:dict def:YES];
       [[TiApp app] showModalController:theController animated:animated];
     } else {
@@ -731,7 +738,7 @@ - (void)viewDidAppear:(BOOL)animated
 }
 - (void)viewDidDisappear:(BOOL)animated
 {
-  if (isModal && closing) {
+  if (isModal && (closing || isForceModalDisable)) {
     [self windowDidClose];
   }
 }

iphone/iphone/Titanium_Prefix.pch

@@ -11,10 +11,10 @@
 #include "ThirdpartyNS.h"
 #import <AvailabilityInternal.h>
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
-#define IS_XCODE_9 true
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
+#define IS_XCODE_11 true
 #else
-#define IS_XCODE_9 false
+#define IS_XCODE_11 false
 #endif
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000

iphone/package.json

@@ -19,8 +19,8 @@
 	"minIosVersion": "9.0",
 	"minWatchosVersion": "2.0",
 	"vendorDependencies": {
-		"xcode": ">=8.0 <=10.x",
-		"ios sdk": ">=9.0 <=12.x"
+		"xcode": ">=9.0 <=11.x",
+		"ios sdk": ">=10.0 <=13.x"
 	},
 	"repository": {
 		"type": "git",