Merge pull request #377 from Countly/fix_safe_area

turtledreams · web-flow · commit b6843f3d08b3 · 2025-02-25T20:32:37.000+09:00
fix: safe area res
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 25.1.2
+* Mitigated an issue where the safe area resolution was not correctly calculated for the content zone on certain iOS devices.
+
 ## 25.1.1
 * Mitigated an issue while setting zone timer interval for content.
 
diff --git a/CountlyContentBuilderInternal.m b/CountlyContentBuilderInternal.m
@@ -48,7 +48,7 @@ - (void)enterContentZone:(NSArray<NSString *> *)tags {
         return;
     
     if(_requestTimer != nil) {
-        CLY_LOG_I(@"Already entered for content zone, please exit from content zone first to start again");
+        CLY_LOG_I(@"%s, Already entered for content zone, please exit from content zone first to start again", __FUNCTION__);
         return;
     }
     
@@ -97,7 +97,7 @@ - (void)fetchContents {
     
     NSURLSessionTask *dataTask = [[NSURLSession sharedSession] dataTaskWithRequest:[self fetchContentsRequest] completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
         if (error) {
-            CLY_LOG_I(@"Fetch content details failed: %@", error);
+            CLY_LOG_I(@"%s, Fetch content details failed: %@", __FUNCTION__, error);
             self->_isRequestQueueLocked = NO;
             return;
         }
@@ -106,13 +106,13 @@ - (void)fetchContents {
         NSDictionary *jsonResponse = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonError];
         
         if (jsonError) {
-            CLY_LOG_I(@"Failed to parse JSON: %@", jsonError);
+            CLY_LOG_I(@"%s, Failed to parse JSON: %@", __FUNCTION__, jsonError);
             self->_isRequestQueueLocked = NO;
             return;
         }
         
         if (!jsonResponse) {
-            CLY_LOG_I(@"Received empty or null response.");
+            CLY_LOG_I(@"%s, Received empty or null response.", __FUNCTION__);
             self->_isRequestQueueLocked = NO;
             return;
         }
@@ -152,30 +152,38 @@ - (NSURLRequest *)fetchContentsRequest
 }
 
 - (CGSize)getWindowSize {
-    CGSize size = CGSizeZero;
+    UIWindow *window = nil;
 
-    // Attempt to retrieve the size from the connected scenes (for modern apps)
     if (@available(iOS 13.0, *)) {
-        NSSet<UIScene *> *scenes = [[UIApplication sharedApplication] connectedScenes];
-        for (UIScene *scene in scenes) {
+        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
             if ([scene isKindOfClass:[UIWindowScene class]]) {
-                UIWindowScene *windowScene = (UIWindowScene *)scene;
-                UIWindow *window = windowScene.windows.firstObject;
-                if (window) {
-                    size = window.bounds.size;
-                    return size; // Return immediately if we find a valid size
-                }
+                window = ((UIWindowScene *)scene).windows.firstObject;
+                break;
             }
         }
+    } else {
+        window = [[UIApplication sharedApplication].delegate window];
     }
 
-    // Fallback for legacy apps using AppDelegate
-    id<UIApplicationDelegate> appDelegate = [[UIApplication sharedApplication] delegate];
-    if ([appDelegate respondsToSelector:@selector(window)]) {
-        UIWindow *legacyWindow = [appDelegate performSelector:@selector(window)];
-        if (legacyWindow) {
-            size = legacyWindow.bounds.size;
-        }
+    if (!window) return CGSizeZero;
+    
+    UIEdgeInsets safeArea = UIEdgeInsetsZero;
+    CGFloat screenScale = [UIScreen mainScreen].scale;
+    if (@available(iOS 11.0, *)) {
+        safeArea = window.safeAreaInsets;
+        safeArea.left /= screenScale;
+        safeArea.bottom /= screenScale;
+        safeArea.right /= screenScale;
+    }
+    
+    UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
+    BOOL isLandscape = UIInterfaceOrientationIsLandscape(orientation);
+    
+    CGSize size = CGSizeMake(window.bounds.size.width, window.bounds.size.height);
+    
+    if(!isLandscape){
+        size.width -= safeArea.left + safeArea.right;
+        size.height -= safeArea.top + safeArea.bottom;
     }
 
     return size;
@@ -196,6 +204,8 @@ - (NSString *)resolutionJson {
         @"landscape": @{@"height": @(lHpW), @"width": @(lWpH)}
     };
     
+    CLY_LOG_D(@"%s, %@", __FUNCTION__, resolutionDict);
+    
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:resolutionDict options:0 error:nil];
     return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
 }
@@ -205,7 +215,7 @@ - (void)showContentWithHtmlPath:(NSString *)urlString placementCoordinates:(NSDi
     NSURL *url = [NSURL URLWithString:urlString];
     
     if (!url || !url.scheme || !url.host) {
-        NSLog(@"The URL is not valid: %@", urlString);
+        CLY_LOG_E(@"%s, The URL is not valid: %@", __FUNCTION__, urlString);
         return;
     }
 
@@ -227,17 +237,17 @@ - (void)showContentWithHtmlPath:(NSString *)urlString placementCoordinates:(NSDi
     CGRect frame = CGRectMake(x, y, width, height);
     
     // Log the URL and the frame
-    CLY_LOG_I(@"Showing content from URL: %@", url);
-    CLY_LOG_I(@"Placement frame: %@", NSStringFromCGRect(frame));
+    CLY_LOG_I(@"%s, Showing content from URL: %@", __FUNCTION__, url);
+    CLY_LOG_I(@"%s, Placement frame: %@", __FUNCTION__, NSStringFromCGRect(frame));
     
     CountlyWebViewManager* webViewManager =  CountlyWebViewManager.new;
         [webViewManager createWebViewWithURL:url frame:frame appearBlock:^
          {
-            CLY_LOG_I(@"Webview appeared");
+            CLY_LOG_I(@"%s, Webview appeared", __FUNCTION__);
             [self clearContentState];
         } dismissBlock:^
          {
-            CLY_LOG_I(@"Webview dismissed");
+            CLY_LOG_I(@"%s, Webview dismissed", __FUNCTION__);
             self->_minuteTimer = [NSTimer scheduledTimerWithTimeInterval:60.0
                                                              target:self
                                                            selector:@selector(enterContentZone)
diff --git a/CountlyWebViewManager.m b/CountlyWebViewManager.m
@@ -9,6 +9,8 @@ @interface CountlyWebViewManager()
 
 @property (nonatomic, strong) PassThroughBackgroundView *backgroundView;
 @property (nonatomic, copy) void (^dismissBlock)(void);
+@property (nonatomic) BOOL topMarginApplied;
+@property (nonatomic) float topMargin;
 @end
 
 @implementation CountlyWebViewManager
@@ -19,9 +21,11 @@ - (void)createWebViewWithURL:(NSURL *)url
                 dismissBlock:(void(^ __nullable)(void))dismissBlock {
     self.dismissBlock = dismissBlock;
     UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
+    self.topMarginApplied = NO;
+    self.topMargin = 0;
     CGRect backgroundFrame = rootViewController.view.bounds;
-    
     self.backgroundView = [[PassThroughBackgroundView alloc] initWithFrame:backgroundFrame];
+    [self applyTopMargin];
     self.backgroundView.backgroundColor = [UIColor clearColor];
     [rootViewController.view addSubview:self.backgroundView];
     
@@ -50,6 +54,41 @@ - (void)createWebViewWithURL:(NSURL *)url
     }];
 }
 
+- (void)applyTopMargin{
+    UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
+    
+    CGRect backgroundFrame = rootViewController.view.bounds;
+    UIWindow *window = nil;
+    if (@available(iOS 13.0, *)) {
+        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
+            if ([scene isKindOfClass:[UIWindowScene class]]) {
+                window = ((UIWindowScene *)scene).windows.firstObject;
+                break;
+            }
+        }
+    } else {
+        window = [[UIApplication sharedApplication].delegate window];
+    }
+    
+    if (@available(iOS 11.0, *)) {
+        UIEdgeInsets safeArea = window.safeAreaInsets;
+        CGFloat screenScale = [UIScreen mainScreen].scale;
+        UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
+        if(!UIInterfaceOrientationIsLandscape(orientation) && !self.topMarginApplied){
+            self.topMarginApplied = YES;
+            CGRect newFrame = self.backgroundView.frame;
+            newFrame.origin.y += safeArea.top;
+            self.backgroundView.frame = newFrame;
+            self.topMargin = safeArea.top;
+        } else if(UIInterfaceOrientationIsLandscape(orientation) && self.topMarginApplied){
+            self.topMarginApplied = NO;
+            CGRect newFrame = self.backgroundView.frame;
+            newFrame.origin.y -= self.topMargin;
+            self.backgroundView.frame = newFrame;
+        }
+    }
+}
+
 - (void)configureWebView:(WKWebView *)webView {
     webView.layer.shadowColor = UIColor.blackColor.CGColor;
     webView.layer.shadowOpacity = 0.5;
@@ -274,6 +313,8 @@ - (void)resizeWebViewWithJSONString:(NSString *)jsonString {
     CGFloat y = [dimensions[@"y"] floatValue];
     CGFloat width = [dimensions[@"w"] floatValue];
     CGFloat height = [dimensions[@"h"] floatValue];
+        
+    [self applyTopMargin];
     
     // Animate the resizing of the web view
     [UIView animateWithDuration:0.3 animations:^{
@@ -284,7 +325,7 @@ - (void)resizeWebViewWithJSONString:(NSString *)jsonString {
         frame.size.height = height;
         self.backgroundView.webView.frame = frame;
     } completion:^(BOOL finished) {
-        CLY_LOG_I(@"Resized web view to width: %f, height: %f", width, height);
+        CLY_LOG_I(@"%s, Resized web view to width: %f, height: %f", __FUNCTION__, width, height);
     }];
 }
 
diff --git a/PassThroughBackgroundView.m b/PassThroughBackgroundView.m
@@ -49,30 +49,38 @@ - (void)adjustWebViewForTraitCollection:(UITraitCollection *)traitCollection {
 }
 
 CGSize getWindowSize(void) {
-    CGSize size = CGSizeZero;
+    UIWindow *window = nil;
 
-    // Attempt to retrieve the size from the connected scenes (for modern apps)
     if (@available(iOS 13.0, *)) {
-        NSSet<UIScene *> *scenes = [[UIApplication sharedApplication] connectedScenes];
-        for (UIScene *scene in scenes) {
+        for (UIScene *scene in [UIApplication sharedApplication].connectedScenes) {
             if ([scene isKindOfClass:[UIWindowScene class]]) {
-                UIWindowScene *windowScene = (UIWindowScene *)scene;
-                UIWindow *window = windowScene.windows.firstObject;
-                if (window) {
-                    size = window.bounds.size;
-                    return size; // Return immediately if we find a valid size
-                }
+                window = ((UIWindowScene *)scene).windows.firstObject;
+                break;
             }
         }
+    } else {
+        window = [[UIApplication sharedApplication].delegate window];
     }
 
-    // Fallback for legacy apps using AppDelegate
-    id<UIApplicationDelegate> appDelegate = [[UIApplication sharedApplication] delegate];
-    if ([appDelegate respondsToSelector:@selector(window)]) {
-        UIWindow *legacyWindow = [appDelegate performSelector:@selector(window)];
-        if (legacyWindow) {
-            size = legacyWindow.bounds.size;
-        }
+    if (!window) return CGSizeZero;
+    
+    UIEdgeInsets safeArea = UIEdgeInsetsZero;
+    CGFloat screenScale = [UIScreen mainScreen].scale;
+    if (@available(iOS 11.0, *)) {
+        safeArea = window.safeAreaInsets;
+        safeArea.left /= screenScale;
+        safeArea.bottom /= screenScale;
+        safeArea.right /= screenScale;
+    }
+    
+    UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
+    BOOL isLandscape = UIInterfaceOrientationIsLandscape(orientation);
+    
+    CGSize size = CGSizeMake(window.bounds.size.width, window.bounds.size.height);
+    
+    if(!isLandscape){
+        size.width -= safeArea.left + safeArea.right;
+        size.height -= safeArea.top + safeArea.bottom;
     }
 
     return size;
@@ -96,7 +104,7 @@ - (void)updateWindowSize {
                              height];
     [self.webView evaluateJavaScript:postMessage completionHandler:^(id result, NSError *err) {
         if (err != nil) {
-            CLY_LOG_E(@"[PassThroughBackgroundView] updateWindowSize, %@", err);
+            CLY_LOG_E(@"%s updateWindowSize, %@", __FUNCTION__, err);
         }
     }];
 }
