Factor in space for top safe area insets into max height calculations in Modal and ImageOnly messages (#3957)

Author: christibbs

Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m

@@ -114,6 +114,13 @@ - (void)viewDidLayoutSubviews {
   CGFloat maxImageViewWidth = self.view.window.frame.size.width - minimalMargine * 2;
   CGFloat maxImageViewHeight = self.view.window.frame.size.height - minimalMargine * 2;
 
+  // Factor in space for the top notch on iPhone X*.
+#if defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+  if (@available(iOS 11.0, *)) {
+    maxImageViewHeight -= self.view.safeAreaInsets.top;
+  }
+#endif  // defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+
   CGFloat adjustedImageViewHeight = self.imageOriginalSize.height;
   CGFloat adjustedImageViewWidth = self.imageOriginalSize.width;
 

Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m

@@ -266,11 +266,21 @@ - (void)layoutFineTuneInPortraitMode {
   // for tablet case, since we use a fixed card height, the reference would be just the card height
   // for non-tablet case, we want to use a dynamic height , so the reference would be the window
   // height
-  CGFloat heightCalcReference =
-      self.messageCardHeightMaxInTabletCase.active
-          ? self.messageCardView.frame.size.height - TopBottomPaddingAroundContent * 2
-          : self.view.window.frame.size.height - TopBottomPaddingAroundContent * 2 -
-                TopBottomPaddingAroundMsgCard * 2;
+  CGFloat heightCalcReference = 0;
+  if (self.messageCardHeightMaxInTabletCase.active) {
+    heightCalcReference =
+        self.messageCardView.frame.size.height - TopBottomPaddingAroundContent * 2;
+  } else {
+    heightCalcReference = self.view.window.frame.size.height - TopBottomPaddingAroundContent * 2 -
+                          TopBottomPaddingAroundMsgCard * 2;
+
+    // Factor in space for the top notch on iPhone X*.
+#if defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+    if (@available(iOS 11.0, *)) {
+      heightCalcReference -= self.view.safeAreaInsets.top;
+    }
+#endif  // defined(__IPHONE_11_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+  }
 
   FIRLogDebug(kFIRLoggerInAppMessagingDisplay, @"I-FID300004",
               @"The height calc reference is %lf "