fix(ios): add back ios 11 constants to code

Rename from IS_XCODE_9 to IS_IOS_SDK_11 per the discussion in #10932
tidev · Aug 1, 2019 · a08aa2e · a08aa2e
1 parent 5d8044e
commit a08aa2e
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 3 deletions.
diff --git a/iphone/Classes/GeolocationModule.m b/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 ...");
 }
 

diff --git a/iphone/Classes/TiAppiOSUserNotificationCenterProxy.m b/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]);

diff --git a/iphone/Classes/TiUIListView.m b/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;

diff --git a/iphone/Classes/TiUINavigationWindowProxy.m b/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
 {

diff --git a/iphone/Classes/TiUIScrollView.m b/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

diff --git a/iphone/Classes/TiUITabGroupProxy.m b/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
 {

diff --git a/iphone/Classes/TiUITabProxy.m b/iphone/Classes/TiUITabProxy.m
@@ -256,8 +256,9 @@ - (void)openWindow:(NSArray *)args
   TiWindowProxy *window = [args objectAtIndex:0];
   ENSURE_TYPE(window, TiWindowProxy);
 
+#if IS_SDK_IOS_11
   [window processForSafeArea];
-
+#endif
   if (window == rootWindow) {
     [rootWindow windowWillOpen];
     [rootWindow windowDidOpen];
@@ -383,7 +384,9 @@ - (void)handleWillShowViewController:(UIViewController *)viewController animated
     }
   }
   TiWindowProxy *theWindow = (TiWindowProxy *)[(TiViewController *)viewController proxy];
+#if IS_SDK_IOS_11
   [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
@@ -738,6 +741,7 @@ - (void)popToRootWindow:(id)args
 
 @synthesize parentOrientationController;
 
+#if IS_SDK_IOS_11
 - (BOOL)homeIndicatorAutoHide
 {
   if (rootWindow == nil) {
@@ -754,7 +758,7 @@ - (BOOL)homeIndicatorAutoHide
   }
   return NO;
 }
-
+#endif
 - (BOOL)hidesStatusBar
 {
   if (rootWindow == nil) {

diff --git a/iphone/Classes/TiUITableView.m b/iphone/Classes/TiUITableView.m
@@ -2355,6 +2355,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]]) {
@@ -2370,6 +2371,7 @@ - (void)viewGetFocus
       controller.navigationItem.searchController = searchController;
     }
   }
+#endif
   if (!hideOnSearch && isSearched && self.searchedString && ![searchController isActive]) {
     isSearched = NO;
     searchController.searchBar.text = self.searchedString;

diff --git a/iphone/Classes/TiUIWebView.h b/iphone/Classes/TiUIWebView.h
@@ -39,11 +39,13 @@
 
 @end
 
+#if IS_SDK_IOS_11
 @interface WebAppProtocolHandler : NSObject <WKURLSchemeHandler> {
 }
 
 + (NSString *)specialProtocolScheme;
 
 @end
+#endif
 
 #endif
diff --git a/iphone/Classes/TiUIWebView.m b/iphone/Classes/TiUIWebView.m
@@ -76,11 +76,13 @@ - (WKWebView *)webView
 
     [config setUserContentController:controller];
 
+#if IS_SDK_IOS_11
     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];
 
@@ -1356,6 +1358,7 @@ - (NSHTTPCookie *)cookieForString:(NSString *)cookieStr
 
 @end
 
+#if IS_SDK_IOS_11
 @implementation WebAppProtocolHandler
 
 + (NSString *)specialProtocolScheme
@@ -1406,5 +1409,6 @@ - (void)webView:(nonnull WKWebView *)webView stopURLSchemeTask:(nonnull id<WKURL
 }
 
 @end
+#endif
 
 #endif
diff --git a/iphone/Classes/TiUIiOSProxy.h b/iphone/Classes/TiUIiOSProxy.h
@@ -162,9 +162,11 @@
 @property (nonatomic, readonly) NSNumber *BLUR_EFFECT_STYLE_DARK;
 #endif
 
+#if IS_SDK_IOS_11
 @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.

diff --git a/iphone/Classes/TiUIiOSProxy.m b/iphone/Classes/TiUIiOSProxy.m
@@ -800,9 +800,11 @@ - (id)createFeedbackGenerator:(id)args
 MAKE_SYSTEM_PROP(FEEDBACK_GENERATOR_IMPACT_STYLE_HEAVY, UIImpactFeedbackStyleHeavy);
 #endif
 
+#if IS_SDK_IOS_11
 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
 

diff --git a/iphone/Classes/TiUIiOSSplitWindow.m b/iphone/Classes/TiUIiOSSplitWindow.m
@@ -256,8 +256,10 @@ - (void)setMasterView_:(id)args
   RELEASE_TO_NIL(masterProxy);
   masterProxy = [args retain];
 
+#if IS_SDK_IOS_11
   TiWindowProxy *masterWindowProxy = (TiWindowProxy *)masterProxy;
   masterWindowProxy.isMasterWindow = YES;
+#endif
 
   if (viewsInitialized) {
     [self initProxy:masterProxy withWrapper:masterViewWrapper];
@@ -280,8 +282,10 @@ - (void)setDetailView_:(id)args
   RELEASE_TO_NIL(detailProxy);
   detailProxy = [args retain];
 
+#if IS_SDK_IOS_11
   TiWindowProxy *detailWindowProxy = (TiWindowProxy *)detailProxy;
   detailWindowProxy.isDetailWindow = YES;
+#endif
 
   if (viewsInitialized) {
     [self initProxy:detailProxy withWrapper:detailViewWrapper];

diff --git a/iphone/Classes/UIModule.m b/iphone/Classes/UIModule.m
@@ -635,8 +635,10 @@ - (NSNumber *)ATTRIBUTE_LINE_BREAK_BY_TRUNCATING_MIDDLE
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_URL, UITextContentTypeURL);
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_CARD_NUMBER, UITextContentTypeCreditCardNumber);
 
+#if IS_SDK_IOS_11
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_USERNAME, UITextContentTypeUsername);
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_PASSWORD, UITextContentTypePassword);
+#endif
 
 #if IS_SDK_IOS_12
 MAKE_SYSTEM_STR(AUTOFILL_TYPE_NEW_PASSWORD, UITextContentTypeNewPassword);

diff --git a/iphone/iphone/Titanium_Prefix.pch b/iphone/iphone/Titanium_Prefix.pch
@@ -22,3 +22,9 @@
 #else
 #define IS_SDK_IOS_12 false
 #endif
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+#define IS_SDK_IOS_11 true
+#else
+#define IS_SDK_IOS_11 false
+#endif