fix: [SDK-5654] lay out IAMs for iPhone Duo and resizable scenes

examples/demo/App/Views/Components/LogView.swift

@@ -42,7 +42,7 @@ struct LogView: View {
             entryList
         }
         .frame(maxWidth: .infinity)
-        .background(OS.Color.logBackground)
+        .background(OS.Color.logBackground, ignoresSafeAreaEdges: .horizontal)
         .accessibilityElement(children: .contain)
         .accessibilityIdentifier("log_view")
     }

examples/demo/App/Views/ContentView.swift

@@ -79,7 +79,8 @@ struct ContentView: View {
                 // Android's `scrollIntoView` `scrollableElement` param.
                 .accessibilityIdentifier("main_scroll_view")
             }
-            .background(OS.Color.lightBackground.ignoresSafeArea())
+            .background(OS.Color.lightBackground.ignoresSafeArea(edges: [.horizontal, .bottom]))
+            .background(OS.Color.primary.ignoresSafeArea())
             .navigationBarTitleDisplayMode(.inline)
             .toolbarBackground(OS.Color.primary, for: .navigationBar)
             .toolbarBackground(.visible, for: .navigationBar)

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m

@@ -1382,7 +1382,7 @@ - (void)webViewContentFinishedLoading:(OSInAppMessageInternal *)message {
     if (!self.window) {
         self.window = [[UIWindow alloc] init];
         self.window.windowLevel = UIWindowLevelAlert;
-        self.window.frame = [[UIScreen mainScreen] bounds];
+        self.window.frame = [UIApplication displayBounds];
     }
 
     self.window.rootViewController = _viewController;

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.h

@@ -41,10 +41,12 @@ NS_ASSUME_NONNULL_BEGIN
 @interface OSInAppMessageView : UIView <WKNavigationDelegate>
 
 @property (weak, nonatomic, nullable) id<OSInAppMessageViewDelegate> delegate;
+// Left & right space around the message, so content is laid out at the width it is displayed at
+@property (nonatomic) UIEdgeInsets horizontalInsets;
 
 - (instancetype _Nonnull)initWithMessage:(OSInAppMessageInternal *)inAppMessage withScriptMessageHandler:(id<WKScriptMessageHandler>)messageHandler;
 - (void)resetWebViewToMaxBoundsAndResizeHeight:(void (^) (NSNumber *newHeight)) completion;
-- (void)updateSafeAreaInsets;
+- (void)updateSafeAreaInsets:(UIEdgeInsets)insets;
 - (void)setupWebViewConstraints;
 - (void)loadReplacementURL:(NSURL *)url;
 - (void)loadedHtmlContent:(NSString *)html withBaseURL:(NSURL *)url;

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/UI/OSInAppMessageView.m

@@ -30,6 +30,7 @@
 #import "OSInAppMessageClickResult.h"
 #import <OneSignalUser/OneSignalUser.h>
 #import "OSMacros.h"
+#import "UIApplication+OneSignal.h"
 
 @interface OSInAppMessageView () <UIScrollViewDelegate, WKUIDelegate, WKNavigationDelegate>
 
@@ -101,7 +102,7 @@ - (void)setupWebviewWithMessageHandler:(id<WKScriptMessageHandler>)handler {
 
     // WebView should use mainBounds as frame since we need to make sure it spans full possible screen size
     // to prevent text wrapping while obtaining true height of message from JS
-    CGRect mainBounds = UIScreen.mainScreen.bounds;
+    CGRect mainBounds = [UIApplication displayBounds];
     mainBounds.size.width -= (2.0 * marginSpacing);
 
     // Setup WebView, delegates, and disable scrolling inside of the WebView
@@ -132,11 +133,8 @@ - (void)setIsFullscreen:(BOOL)isFullscreen {
 }
 
 - (void)setWebviewFrame {
-    CGRect mainBounds = UIScreen.mainScreen.bounds;
-    if (!self.isFullscreen) {
-        CGFloat marginSpacing = [OneSignalCoreHelper sizeToScale:MESSAGE_MARGIN];
-        mainBounds.size.width -= (2.0 * marginSpacing);
-    }
+    CGRect mainBounds = [UIApplication displayBounds];
+    mainBounds.size.width -= self.horizontalInsets.left + self.horizontalInsets.right;
     [self.webView setFrame:mainBounds];
 }
 
@@ -157,6 +155,9 @@ - (void)resetWebViewToMaxBoundsAndResizeHeight:(void (^) (NSNumber *newHeight))
         if (error) {
             NSString *errorMessage = [NSString stringWithFormat:@"Javascript Method: %@ Evaluated with Error: %@", OS_JS_GET_PAGE_META_DATA_METHOD, error];
             [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:errorMessage];
+            // Still complete so a rotation or fold re-shows the message at its previous height
+            [self setupWebViewConstraints];
+            completion(nil);
             return;
         }
         NSString *successMessage = [NSString stringWithFormat:@"Javascript Method: %@ Evaluated with Success: %@", OS_JS_GET_PAGE_META_DATA_METHOD, result];
@@ -170,13 +171,8 @@ - (void)resetWebViewToMaxBoundsAndResizeHeight:(void (^) (NSNumber *newHeight))
     }];
 }
 
-- (void)updateSafeAreaInsets {
-    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:OS_JS_SAFE_AREA_INSETS_OBJ,top, bottom, right, left];
+- (void)updateSafeAreaInsets:(UIEdgeInsets)insets {
+    NSString *safeAreaInsetsObjectString = [NSString stringWithFormat:OS_JS_SAFE_AREA_INSETS_OBJ, insets.top, insets.bottom, insets.right, insets.left];
 
     NSString *setInsetsString = [NSString stringWithFormat:OS_SET_SAFE_AREA_INSETS_METHOD, safeAreaInsetsObjectString];
     [self.webView evaluateJavaScript:setInsetsString completionHandler:^(NSDictionary *result, NSError * _Nullable error) {