feat: impl widget action url handler

arifBurakDemiray · arifBurakDemiray · commit 4c562627b529 · 2025-05-23T16:47:35.000+03:00
diff --git a/CountlyCommon.m b/CountlyCommon.m
@@ -330,6 +330,7 @@ - (NSURLSession *)URLSession
 }
 
 - (CGSize)getWindowSize {
+#if (TARGET_OS_IOS)
     UIWindow *window = nil;
 
     if (@available(iOS 13.0, *)) {
@@ -365,6 +366,8 @@ - (CGSize)getWindowSize {
     }
 
     return size;
+#endif
+    return CGSizeZero;
 }
 
 @end
diff --git a/CountlyFeedbackWidget.h b/CountlyFeedbackWidget.h
@@ -6,9 +6,6 @@
 
 #import <Foundation/Foundation.h>
 #import "CountlyConfig.h"
-#if (TARGET_OS_IOS)
-#import <WebKit/WebKit.h>
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -21,11 +18,7 @@ extern NSString* const kCountlyReservedEventSurvey;
 extern NSString* const kCountlyReservedEventNPS;
 extern NSString* const kCountlyReservedEventRating;
 
-#if TARGET_OS_IOS
-@interface CountlyFeedbackWidget : NSObject <WKNavigationDelegate>
-#else
 @interface CountlyFeedbackWidget : NSObject
-#endif
 #if (TARGET_OS_IOS)
 
 @property (nonatomic, readonly) CLYFeedbackWidgetType type;
diff --git a/CountlyFeedbackWidget.m b/CountlyFeedbackWidget.m
@@ -5,6 +5,7 @@
 // Please visit www.count.ly for more information.
 
 #import "CountlyCommon.h"
+#import "CountlyWebViewManager.h"
 #if (TARGET_OS_IOS)
 #import <WebKit/WebKit.h>
 #endif
@@ -58,108 +59,105 @@ - (void)present
 - (void)presentWithAppearBlock:(void(^ __nullable)(void))appearBlock andDismissBlock:(void(^ __nullable)(void))dismissBlock
 {
     CLY_LOG_I(@"%s %@ %@", __FUNCTION__, appearBlock, dismissBlock);
-    [self presentWithCallback:^(WidgetState widgetState) {
+    id widgetCallback = ^(WidgetState widgetState) {
         if(appearBlock && widgetState == WIDGET_APPEARED) {
             appearBlock();
         }
         
         if(dismissBlock && widgetState == WIDGET_CLOSED) {
             dismissBlock();
         }
-    }];
+    };
+    
+    if (self.widgetVersion) {
+        [self presentWidget_new:widgetCallback];
+    } else {
+        [self presentWithCallback:widgetCallback];
+    }
+    
 }
 
-- (void)presentWithCallback:(WidgetCallback) widgetCallback;
+- (void)presentWidget_new:(WidgetCallback) widgetCallback;
 {
     CLY_LOG_I(@"%s %@", __FUNCTION__, widgetCallback);
     if (!CountlyConsentManager.sharedInstance.consentForFeedback)
         return;
     
-    BOOL isWidgetOld = ![self.widgetVersion length];
+    CGSize size = [CountlyCommon.sharedInstance getWindowSize];
     
-    _webVC = CLYInternalViewController.new;
-    _widgetCallback = widgetCallback;
+    dispatch_async(dispatch_get_main_queue(), ^ {
+        CGRect frame = CGRectMake(0.0, 0.0, size.width, size.height);
+        
+        // Log the URL and the frame
+        CLY_LOG_I(@"%s, Placement frame: %@", __FUNCTION__, NSStringFromCGRect(frame));
+        
+        CountlyWebViewManager* webViewManager =  CountlyWebViewManager.new;
+            [webViewManager createWebViewWithURL:[self generateWidgetURL] frame:frame appearBlock:^
+             {
+                CLY_LOG_I(@"%s, Webview appeared", __FUNCTION__);
+                if(widgetCallback)
+                    widgetCallback(WIDGET_APPEARED);
+            } dismissBlock:^
+             {
+                CLY_LOG_I(@"%s, Webview dismissed", __FUNCTION__);
+                if (widgetCallback)
+                    widgetCallback(WIDGET_CLOSED);
+                [self recordReservedEventForDismissing];
+            }];
+    });
+}
+
+- (void)presentWithCallback:(WidgetCallback) widgetCallback;
+{
+    CLY_LOG_I(@"%s %@", __FUNCTION__, widgetCallback);
+    if (!CountlyConsentManager.sharedInstance.consentForFeedback)
+        return;
     
-    if (isWidgetOld) {
-        _webVC.view.backgroundColor = [UIColor.blackColor colorWithAlphaComponent:0.4];
-        _webVC.modalPresentationStyle = UIModalPresentationCustom;
-    } else {
-        _webVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
-        _webVC.view.bounds = UIScreen.mainScreen.bounds;
-        _webVC.view.backgroundColor = [UIColor clearColor];
+    if (self.widgetVersion) {
+        [self presentWidget_new:widgetCallback];
+        return;
     }
     
+    __block CLYInternalViewController* webVC = CLYInternalViewController.new;
+    webVC.view.backgroundColor = [UIColor.blackColor colorWithAlphaComponent:0.4];
+    webVC.modalPresentationStyle = UIModalPresentationCustom;
+    
     // Configure WKWebView with non-persistent data store
     WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
     configuration.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
-    WKWebView* webView = [[WKWebView alloc] initWithFrame:_webVC.view.bounds configuration:configuration];
-    webView.navigationDelegate = self;
-    
-    if (isWidgetOld) {
-        webView.layer.shadowColor = UIColor.blackColor.CGColor;
-        webView.layer.shadowOpacity = 0.5;
-        webView.layer.shadowOffset = CGSizeMake(0.0f, 5.0f);
-        webView.layer.masksToBounds = NO;
-    }
+    WKWebView* webView = [[WKWebView alloc] initWithFrame:webVC.view.bounds configuration:configuration];
+    webView.layer.shadowColor = UIColor.blackColor.CGColor;
+    webView.layer.shadowOpacity = 0.5;
+    webView.layer.shadowOffset = CGSizeMake(0.0f, 5.0f);
+    webView.layer.masksToBounds = NO;
     
     webView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    [_webVC.view addSubview:webView];
-    _webVC.webView = webView;
-    NSURLRequest* request = [self displayRequest];
+    [webVC.view addSubview:webView];
+    webVC.webView = webView;
+    NSURLRequest* request = [NSURLRequest requestWithURL:[self generateWidgetURL]];
     [webView loadRequest:request];
     
-    
-    if (isWidgetOld) {
-        CLYButton* dismissButton = [CLYButton dismissAlertButton];
-        dismissButton.onClick = ^(id sender)
+    CLYButton* dismissButton = [CLYButton dismissAlertButton];
+    dismissButton.onClick = ^(id sender)
+    {
+        [webVC dismissViewControllerAnimated:YES completion:^
         {
-            [self closeFeedbackWidget];
-        };
-        [webView addSubview:dismissButton];
-        [dismissButton positionToTopRight];
-    }
-    
-    [CountlyCommon.sharedInstance tryPresentingViewController:self.webVC withCompletion:^{
+            CLY_LOG_D(@"Feedback widget dismissed. Widget ID: %@, Name: %@", self.ID, self.name);
+            if (widgetCallback)
+                widgetCallback(WIDGET_CLOSED);
+            webVC = nil;
+        }];
+        [self recordReservedEventForDismissing];
+    };
+    [webView addSubview:dismissButton];
+    [dismissButton positionToTopRight];
+    [CountlyCommon.sharedInstance tryPresentingViewController:webVC withCompletion:^{
         CLY_LOG_D(@"Feedback widget presented. Widget ID: %@, Name: %@", self.ID, self.name);
         if(widgetCallback)
             widgetCallback(WIDGET_APPEARED);
     }];
 }
 
-- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
-    NSString *url = navigationAction.request.URL.absoluteString;
-    
-    if ([url hasPrefix:@"https://countly_action_event"] && [url containsString:@"cly_widget_command=1"]) {
-        if ([url containsString:@"close=1"]) {
-            [self closeFeedbackWidget];
-        }
-        
-        decisionHandler(WKNavigationActionPolicyCancel);
-    } else {
-        decisionHandler(WKNavigationActionPolicyAllow);
-    }
-}
-
-- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
-    CLY_LOG_I(@"%s Web view has started loading", __FUNCTION__);
-}
-
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
-    CLY_LOG_I(@"%s Web view has finished loading", __FUNCTION__);
-}
-
-- (void)closeFeedbackWidget{
-    [self.webVC dismissViewControllerAnimated:YES completion:^
-    {
-        CLY_LOG_D(@"Feedback widget dismissed. Widget ID: %@, Name: %@", self.ID, self.name);
-        if (self.widgetCallback)
-            self.widgetCallback(WIDGET_CLOSED);
-        self.webVC = nil;
-        self.widgetCallback = nil;
-    }];
-    [self recordReservedEventForDismissing];
-}
-
 - (void)getWidgetData:(void (^)(NSDictionary * __nullable widgetData, NSError * __nullable error))completionHandler
 {
     CLY_LOG_I(@"%s %@", __FUNCTION__, completionHandler);
@@ -248,7 +246,7 @@ - (NSURLRequest *)dataRequest
     }
 }
 
-- (NSURLRequest *)displayRequest {
+- (NSURL *)generateWidgetURL {
     // Create the base URL with endpoint and feedback type
     NSMutableString *URL = [NSMutableString stringWithFormat:@"%@%@/%@",
                             CountlyConnectionManager.sharedInstance.host,
@@ -296,8 +294,7 @@ - (NSURLRequest *)displayRequest {
         [URL appendFormat:@"&custom=%@", customString.cly_URLEscaped];
     }
     
-    // Create and return the NSURLRequest
-    return [NSURLRequest requestWithURL:[NSURL URLWithString:URL]];
+    return [NSURL URLWithString:URL];
 }
 
 
diff --git a/CountlyWebViewManager.m b/CountlyWebViewManager.m
@@ -55,9 +55,6 @@ - (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) {
@@ -72,7 +69,6 @@ - (void)applyTopMargin{
     
     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;
@@ -123,26 +119,27 @@ - (void)configureDismissButton:(CLYButton *)dismissButton forWebView:(WKWebView
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
     NSString *url = navigationAction.request.URL.absoluteString;
     
-    if ([url hasPrefix:@"https://countly_action_event"] && [url containsString:@"cly_x_action_event=1"]) {
-        NSDictionary *queryParameters = [self parseQueryString:url];
-        NSString *action = queryParameters[@"action"];
-        if(action) {
-            if ([action isEqualToString:@"event"]) {
-                NSString *eventsJson = queryParameters[@"event"];
-                if(eventsJson) {
-                    [self recordEventsWithJSONString:eventsJson];
-                }
-            } else if ([action isEqualToString:@"link"]) {
-                NSString *link = queryParameters[@"link"];
-                if(link) {
-                    [self openExternalLink:link];
-                }
-            } else if ([action isEqualToString:@"resize_me"]) {
-                NSString *resize = queryParameters[@"resize_me"];
-                if(resize) {
-                    [self resizeWebViewWithJSONString:resize];
-                }
+    if ([url containsString:@"cly_x_int=1"]) {
+        CLY_LOG_I(@"%s Opening url [%@] in external browser", __FUNCTION__, url);
+        [[UIApplication sharedApplication] openURL:navigationAction.request.URL options:@{} completionHandler:^(BOOL success) {
+            if (success) {
+                CLY_LOG_I(@"%s url [%@] opened in external browser", __FUNCTION__, url);
+            }
+            else {
+                CLY_LOG_I(@"%s unable to open url [%@] in external browser", __FUNCTION__, url);
             }
+        }];
+        decisionHandler(WKNavigationActionPolicyCancel);
+        return;
+    }
+    
+    if ([url hasPrefix:@"https://countly_action_event"]) {
+        NSDictionary *queryParameters = [self parseQueryString:url];
+        
+        if([url containsString:@"cly_x_action_event=1"]){
+            [self contentURLAction:queryParameters];
+        } else if([url containsString:@"cly_widget_command=1"]){
+            [self widgetURLAction:queryParameters];
         }
         
         if ([queryParameters[@"close"] boolValue]) {
@@ -198,6 +195,32 @@ - (void)animateView:(UIView *)view withAnimationType:(AnimationType)animationTyp
     }];
 }
 
+- (void)contentURLAction:(NSDictionary *)queryParameters {
+    NSString *action = queryParameters[@"action"];
+    if(action) {
+        if ([action isEqualToString:@"event"]) {
+            NSString *eventsJson = queryParameters[@"event"];
+            if(eventsJson) {
+                [self recordEventsWithJSONString:eventsJson];
+            }
+        } else if ([action isEqualToString:@"link"]) {
+            NSString *link = queryParameters[@"link"];
+            if(link) {
+                [self openExternalLink:link];
+            }
+        } else if ([action isEqualToString:@"resize_me"]) {
+            NSString *resize = queryParameters[@"resize_me"];
+            if(resize) {
+                [self resizeWebViewWithJSONString:resize];
+            }
+        }
+    }
+}
+
+- (void)widgetURLAction:(NSDictionary *)queryParameters {
+    // none action yet
+}
+
 - (NSDictionary *)parseQueryString:(NSString *)url {
     NSMutableDictionary *queryDict = [NSMutableDictionary dictionary];
     NSArray *urlComponents = [url componentsSeparatedByString:@"?"];

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,7 @@ - (NSURLSession *)URLSession`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`- (CGSize)getWindowSize {`
	`333`	`+#if (TARGET_OS_IOS)`
`333`	`334`	`UIWindow *window = nil;`
`334`	`335`
`335`	`336`	`if (@available(iOS 13.0, *)) {`
`@@ -365,6 +366,8 @@ - (CGSize)getWindowSize {`
`365`	`366`	`}`
`366`	`367`
`367`	`368`	`return size;`
	`369`	`+#endif`
	`370`	`+ return CGSizeZero;`
`368`	`371`	`}`
`369`	`372`
`370`	`373`	`@end`