Merge pull request #984 from OneSignal/feature/IAM_margin_control

Enable no margin IAMs

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.m

@@ -93,6 +93,10 @@ @interface OSInAppMessageViewController ()
 // BOOL to track if the message content has loaded before tags have finished loading for liquid templating
 @property (nonatomic, nullable) NSString *pendingHTMLContent;
 
+@property (nonatomic) BOOL useHeightMargin;
+
+@property (nonatomic) BOOL useWidthMargin;
+
 @end
 
 @implementation OSInAppMessageViewController
@@ -101,6 +105,8 @@ - (instancetype _Nonnull)initWithMessage:(OSInAppMessageInternal *)inAppMessage
     if (self = [super init]) {
         self.message = inAppMessage;
         self.delegate = delegate;
+        self.useHeightMargin = YES;
+        self.useWidthMargin = YES;
     }
 
     return self;
@@ -231,8 +237,7 @@ - (OSResultSuccessBlock)messageContentOnSuccess {
             [[OneSignal sessionManager] onInAppMessageReceived:self.message.messageId];
 
         let baseUrl = [NSURL URLWithString:OS_IAM_WEBVIEW_BASE_URL];
-        self.pendingHTMLContent = data[@"html"];
-        self.maxDisplayTime = [data[@"display_duration"] doubleValue];
+        [self parseContentData:data];
         if (self.waitForTags) {
             return;
         }
@@ -242,6 +247,22 @@ - (OSResultSuccessBlock)messageContentOnSuccess {
     };
 }
 
+- (void)parseContentData:(NSDictionary *)data {
+    self.pendingHTMLContent = data[@"html"];
+    self.maxDisplayTime = [data[@"display_duration"] doubleValue];
+    NSDictionary *styles = data[@"styles"];
+    if (styles) {
+        // We are currently only allowing default margin or no margin.
+        // If we receive a number that isn't 0 we want to use default margin for now.
+        if (styles[@"remove_height_margin"]) {
+            self.useHeightMargin = ![styles[@"remove_height_margin"] boolValue];
+        }
+        if (styles[@"remove_width_margin"]) {
+            self.useWidthMargin = ![styles[@"remove_width_margin"] boolValue];
+        }
+    }
+}
+
 - (void)setWaitForTags:(BOOL)waitForTags {
     _waitForTags = waitForTags;
     if (!waitForTags && self.pendingHTMLContent) {
@@ -321,18 +342,18 @@ - (void)addConstraintsForMessage {
     // Height constraint based on the IAM being full screen or any others with a specific height
     // NOTE: full screen IAM payload has no height, so match screen height minus margins
     if (self.message.position == OSInAppMessageDisplayPositionFullScreen)
-        self.heightConstraint = [self.messageView.heightAnchor constraintEqualToAnchor:height multiplier:1.0 constant:-2.0f * marginSpacing];
+        self.heightConstraint = [self.messageView.heightAnchor constraintEqualToAnchor:height multiplier:1.0 constant:(self.useHeightMargin ? (2*-marginSpacing) : 0)];
     else
         self.heightConstraint = [self.messageView.heightAnchor constraintEqualToConstant:self.message.height.doubleValue];
 
     // The aspect ratio for each type (ie. Banner) determines the height normally
     // However the actual height of the HTML content takes priority.
     // Makes sure our webview is never taller than our screen.
-    [self.messageView.heightAnchor constraintLessThanOrEqualToAnchor:height multiplier:1.0 constant:-2.0f * marginSpacing].active = true;
+    [self.messageView.heightAnchor constraintLessThanOrEqualToAnchor:height multiplier:1.0 constant:(self.useHeightMargin ? (2*-marginSpacing) : 0)].active = true;
 
     // Pins the message view to the left & right
-    let leftConstraint = [self.messageView.leadingAnchor constraintEqualToAnchor:leading constant:marginSpacing];
-    let rightConstraint = [self.messageView.trailingAnchor constraintEqualToAnchor:trailing constant:-marginSpacing];
+    let leftConstraint = [self.messageView.leadingAnchor constraintEqualToAnchor:leading constant:(self.useWidthMargin ? marginSpacing : 0)];
+    let rightConstraint = [self.messageView.trailingAnchor constraintEqualToAnchor:trailing constant:(self.useWidthMargin ? -marginSpacing : 0)];
 
     // Ensure the message view is always centered horizontally
     [self.messageView.centerXAnchor constraintEqualToAnchor:center].active = true;
@@ -355,8 +376,10 @@ - (void)addConstraintsForMessage {
             self.view.window.frame = CGRectMake(0, 0, bannerWidth, bannerHeight);
 
             self.initialYConstraint = [self.messageView.bottomAnchor constraintEqualToAnchor:self.view.topAnchor constant:-8.0f];
-            self.finalYConstraint = [self.messageView.topAnchor constraintEqualToAnchor:top constant:marginSpacing];
-            self.panVerticalConstraint = [self.messageView.topAnchor constraintEqualToAnchor:top constant:marginSpacing];
+            self.finalYConstraint = [self.messageView.topAnchor constraintEqualToAnchor:top
+                                                                               constant:(self.useHeightMargin ? marginSpacing : 0)];
+            self.panVerticalConstraint = [self.messageView.topAnchor constraintEqualToAnchor:top
+                                                                                    constant:(self.useHeightMargin ? marginSpacing : 0)];
             break;
         case OSInAppMessageDisplayPositionBottom:
             if (@available(iOS 11, *)) {
@@ -367,16 +390,23 @@ - (void)addConstraintsForMessage {
             self.view.window.frame = CGRectMake(0, bannerMessageY, bannerWidth, bannerHeight);
 
             self.initialYConstraint = [self.messageView.topAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:8.0f];
-            self.finalYConstraint = [self.messageView.bottomAnchor constraintEqualToAnchor:bottom constant:-marginSpacing];
-            self.panVerticalConstraint = [self.messageView.bottomAnchor constraintEqualToAnchor:bottom constant:-marginSpacing];
+            self.finalYConstraint = [self.messageView.bottomAnchor constraintEqualToAnchor:bottom
+                                                                                  constant:(self.useHeightMargin ? -marginSpacing : 0)];
+            self.panVerticalConstraint = [self.messageView.bottomAnchor constraintEqualToAnchor:bottom
+                                                                                       constant:(self.useHeightMargin ? -marginSpacing : 0)];
             break;
         case OSInAppMessageDisplayPositionFullScreen:
         case OSInAppMessageDisplayPositionCenterModal:
             self.view.window.frame = mainBounds;
+            NSLayoutAnchor *centerYanchor = self.view.centerYAnchor;
+            if (@available(iOS 11, *)) {
+                let safeArea = self.view.safeAreaLayoutGuide;
+                centerYanchor = safeArea.centerYAnchor;
+            }
 
-            self.initialYConstraint = [self.messageView.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor constant:0.0f];
-            self.finalYConstraint = [self.messageView.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor constant:0.0f];
-            self.panVerticalConstraint = [self.messageView.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor constant:0.0f];
+            self.initialYConstraint = [self.messageView.centerYAnchor constraintEqualToAnchor:centerYanchor constant:0.0f];
+            self.finalYConstraint = [self.messageView.centerYAnchor constraintEqualToAnchor:centerYanchor constant:0.0f];
+            self.panVerticalConstraint = [self.messageView.centerYAnchor constraintEqualToAnchor:centerYanchor constant:0.0f];
             self.messageView.transform = CGAffineTransformMakeScale(0, 0);
             break;
     }