use isFullscreen boolean to decide on safe area usage

emawby · emawby · commit 83b1986d2ebf · 2021-11-04T09:21:06.000-07:00
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
@@ -85,7 +85,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [OneSignal addSubscriptionObserver:self];
     [OneSignal addEmailSubscriptionObserver:self];
     [OneSignal setInAppMessageLifecycleHandler:self];
-    [OneSignal pauseInAppMessages:true];
+    [OneSignal pauseInAppMessages:false];
 
     [OneSignal setNotificationWillShowInForegroundHandler:notificationReceiverBlock];
     [OneSignal setNotificationOpenedHandler:openNotificationHandler];
@@ -95,7 +95,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
-#define ONESIGNAL_APP_ID_DEFAULT @"0ba9731b-33bd-43f4-8b59-61172e27447d"
+#define ONESIGNAL_APP_ID_DEFAULT @"9ddf83fd-6cf8-403d-98a1-bd5285b23d0e"
 #define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"
 
 + (NSString*)getOneSignalAppId {
diff --git a/iOS_SDK/OneSignalSDK/Source/OSInAppMessageView.m b/iOS_SDK/OneSignalSDK/Source/OSInAppMessageView.m
@@ -90,12 +90,12 @@ - (NSString *)addTagsToHTML:(NSString *)html {
 - (void)loadedHtmlContent:(NSString *)html withBaseURL:(NSURL *)url {
     // UI Update must be done on the main thread
     NSLog(@"11111 [self.webView loadHTMLString:html baseURL:url];");
-    dispatch_sync(dispatch_get_main_queue(), ^{
-        NSLog(@"222222 [self.webView loadHTMLString:html baseURL:url];");
-        NSString *taggedHTML = [self addTagsToHTML:html];
-        [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"loadedHtmlContent with Tags: \n%@", taggedHTML]];
-        [self.webView loadHTMLString:taggedHTML baseURL:url];
-    });
+    
+    NSLog(@"222222 [self.webView loadHTMLString:html baseURL:url];");
+    NSString *taggedHTML = [self addTagsToHTML:html];
+    [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"loadedHtmlContent with Tags: \n%@", taggedHTML]];
+    [self.webView loadHTMLString:taggedHTML baseURL:url];
+    
 }
 
 - (void)setupWebviewWithMessageHandler:(id<WKScriptMessageHandler>)handler {
diff --git a/iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.m b/iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.m
@@ -97,6 +97,8 @@ @interface OSInAppMessageViewController ()
 
 @property (nonatomic) BOOL useWidthMargin;
 
+@property (nonatomic) BOOL isFullscreen;
+
 @end
 
 @implementation OSInAppMessageViewController
@@ -225,25 +227,27 @@ - (void)maxDisplayTimeTimerFinished {
 
 - (OSResultSuccessBlock)messageContentOnSuccess {
     return ^(NSDictionary *data) {
-        if (!data) {
-            [self encounteredErrorLoadingMessageContent:nil];
-            return;
-        }
-        
-        let message = [NSString stringWithFormat:@"In App Messaging htmlContent.html: %@", data[@"html"]];
-        [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:message];
-        
-        if (!self.message.isPreview)
-            [[OneSignal sessionManager] onInAppMessageReceived:self.message.messageId];
+        [OneSignalHelper dispatch_async_on_main_queue:^{
+            if (!data) {
+                [self encounteredErrorLoadingMessageContent:nil];
+                return;
+            }
+            
+            let message = [NSString stringWithFormat:@"In App Messaging htmlContent.html: %@", data[@"html"]];
+            [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:message];
+            
+            if (!self.message.isPreview)
+                [[OneSignal sessionManager] onInAppMessageReceived:self.message.messageId];
 
-        let baseUrl = [NSURL URLWithString:OS_IAM_WEBVIEW_BASE_URL];
-        [self parseContentData:data];
-        if (self.waitForTags) {
-            return;
-        }
-        [self.delegate messageWillDisplay:self.message];
-        [self.messageView loadedHtmlContent:self.pendingHTMLContent withBaseURL:baseUrl];
-        self.pendingHTMLContent = nil;
+            let baseUrl = [NSURL URLWithString:OS_IAM_WEBVIEW_BASE_URL];
+            [self parseContentData:data];
+            if (self.waitForTags) {
+                return;
+            }
+            [self.delegate messageWillDisplay:self.message];
+            [self.messageView loadedHtmlContent:self.pendingHTMLContent withBaseURL:baseUrl];
+            self.pendingHTMLContent = nil;
+        }];
     };
 }
 
@@ -261,6 +265,34 @@ - (void)parseContentData:(NSDictionary *)data {
             self.useWidthMargin = ![styles[@"remove_width_margin"] boolValue];
         }
     }
+    self.isFullscreen = !self.useHeightMargin;
+    if (self.isFullscreen) {
+        self.pendingHTMLContent = [self setContentInsetsInHTML:self.pendingHTMLContent];
+    }
+}
+
+- (NSString *)setContentInsetsInHTML:(NSString *)html {
+    NSMutableString *newHTML = [[NSMutableString alloc] initWithString:html];
+    if (@available(iOS 11, *)) {
+        UIWindow *keyWindow = UIApplication.sharedApplication.keyWindow;
+        CGFloat top = keyWindow.safeAreaInsets.top;
+        CGFloat bottom = keyWindow.safeAreaInsets.bottom;
+        CGFloat right = keyWindow.safeAreaInsets.right;
+        CGFloat left = keyWindow.safeAreaInsets.left;
+        NSString *safeAreaInsetsObjectString = [NSString stringWithFormat:@"{\n\
+                            top: %f,\n\
+                            bottom: %f,\n\
+                            right: %f,\n\
+                            left: %f,\n\
+                        }",top, bottom, right, left];
+        //Script to set the tags for liquid tag substitution
+        NSString *insetsString = [NSString stringWithFormat:@"\n\n\
+                             <script> \
+                                setSafeAreaInsets(%@);\
+                             </script>",safeAreaInsetsObjectString];
+        [newHTML appendString: insetsString];
+    }
+    return newHTML;
 }
 
 - (void)setWaitForTags:(BOOL)waitForTags {
@@ -318,13 +350,15 @@ - (void)addConstraintsForMessage {
     // as a notch or a rounded corner on newer iOS devices like iPhone X
     // Note that Safe Area layout guides were only introduced in iOS 11
     if (@available(iOS 11, *)) {
-        let safeArea = self.view.safeAreaLayoutGuide;
-        top = safeArea.topAnchor;
-        bottom = safeArea.bottomAnchor;
-        leading = safeArea.leadingAnchor;
-        trailing = safeArea.trailingAnchor;
-        center = safeArea.centerXAnchor;
-        height = safeArea.heightAnchor;
+        if (!self.isFullscreen) {
+            let safeArea = self.view.safeAreaLayoutGuide;
+            top = safeArea.topAnchor;
+            bottom = safeArea.bottomAnchor;
+            leading = safeArea.leadingAnchor;
+            trailing = safeArea.trailingAnchor;
+            center = safeArea.centerXAnchor;
+            height = safeArea.heightAnchor;
+        }
     }
     
     CGRect mainBounds = [OneSignalViewHelper getScreenBounds];
@@ -400,8 +434,10 @@ - (void)addConstraintsForMessage {
             self.view.window.frame = mainBounds;
             NSLayoutAnchor *centerYanchor = self.view.centerYAnchor;
             if (@available(iOS 11, *)) {
-                let safeArea = self.view.safeAreaLayoutGuide;
-                centerYanchor = safeArea.centerYAnchor;
+                if (!self.isFullscreen) {
+                    let safeArea = self.view.safeAreaLayoutGuide;
+                    centerYanchor = safeArea.centerYAnchor;
+                }
             }
 
             self.initialYConstraint = [self.messageView.centerYAnchor constraintEqualToAnchor:centerYanchor constant:0.0f];
@@ -670,6 +706,10 @@ - (BOOL)shouldDismissMessageWithPanGestureOffset:(double)offset withVelocity:(do
     }
 }
 
+- (void)updateSafeAreaInsets {
+    
+}
+
 /*
  This delegate function gets called when in-app html is load or action button is tapped
  */
@@ -701,6 +741,7 @@ - (void)jsEventOccurredWithBody:(NSData *)body {
             case OSInAppMessageBridgeEventTypePageResize: {
                 // Unused resize event for IAM during actions like orientation changes and displaying an IAM
                 // self.message.height = event.resize.height;
+                [self updateSafeAreaInsets];
                 break;
             }
             case OSInAppMessageBridgeEventTypeActionTaken: {
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h b/iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h
@@ -33,8 +33,8 @@
 // Networking
 #define OS_API_VERSION @"1"
 #define OS_API_ACCEPT_HEADER @"application/vnd.onesignal.v" OS_API_VERSION @"+json"
-#define OS_API_SERVER_URL @"https://api.onesignal.com/"
-#define OS_IAM_WEBVIEW_BASE_URL @"https://onesignal.com/"
+#define OS_API_SERVER_URL @"https://api.staging-01.onesignal.com/"
+#define OS_IAM_WEBVIEW_BASE_URL @"https://staging.onesignal.com/"
 
 // OneSignalUserDefault keys
 // String values start with "OSUD_" to maintain a level of uniqueness from other libs and app code
