Fixes iOS macros for webview and content builder

Countly · Sep 9, 2024 · 64ac554 · 64ac554
1 parent 46a367f
commit 64ac554
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/CountlyContentBuilder.h b/CountlyContentBuilder.h
@@ -6,7 +6,9 @@
 
 
 #import <Foundation/Foundation.h>
+#if (TARGET_OS_IOS)
 #import <UIKit/UIKit.h>
+#endif
 NS_ASSUME_NONNULL_BEGIN
 @interface CountlyContentBuilder: NSObject
 #if (TARGET_OS_IOS)

diff --git a/CountlyContentBuilderInternal.h b/CountlyContentBuilderInternal.h
@@ -5,7 +5,9 @@
 // Please visit www.count.ly for more information.
 
 #import <Foundation/Foundation.h>
+#if (TARGET_OS_IOS)
 #import <UIKit/UIKit.h>
+#endif
 #import "CountlyCommon.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface CountlyContentBuilderInternal: NSObject

diff --git a/CountlyWebViewManager.h b/CountlyWebViewManager.h
@@ -4,9 +4,11 @@
 //
 // Please visit www.count.ly for more information.
 
-
+#if (TARGET_OS_IOS)
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
+#endif
+#import "CountlyCommon.h"
 
 NS_ASSUME_NONNULL_BEGIN
 #if (TARGET_OS_IOS)
@@ -19,17 +21,17 @@ typedef NS_ENUM(NSUInteger, AnimationType) {
     AnimationTypeIncreaseHeightFromBottom
 };
 
-#endif
+
 
 @interface CountlyWebViewManager : NSObject <WKNavigationDelegate>
 
-#if (TARGET_OS_IOS)
 - (void)createWebViewWithURL:(NSURL *)url
                      frame:(CGRect)frame
                  appearBlock:(void(^ __nullable)(void))appearBlock
                 dismissBlock:(void(^ __nullable)(void))dismissBlock;
 
-#endif
 
-NS_ASSUME_NONNULL_END
+
 @end
+#endif
+NS_ASSUME_NONNULL_END
diff --git a/CountlyWebViewManager.m b/CountlyWebViewManager.m
@@ -4,11 +4,11 @@
 #import "CountlyCommon.h"
 
 //TODO: improve logging, check edge cases
-@interface CountlyWebViewManager()
 #if (TARGET_OS_IOS)
+@interface CountlyWebViewManager()
+
 @property (nonatomic, strong) PassThroughBackgroundView *backgroundView;
 @property (nonatomic, copy) void (^dismissBlock)(void);
-#endif
 @end
 
 @implementation CountlyWebViewManager
@@ -246,3 +246,4 @@ - (void)closeWebView {
 }
 #endif
 @end
+#endif
diff --git a/PassThroughBackgroundView.h b/PassThroughBackgroundView.h
@@ -5,16 +5,23 @@
 // Please visit www.count.ly for more information.
 
 
+#if (TARGET_OS_IOS)
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
+#endif
+
 #import "CountlyCommon.h"
+
 NS_ASSUME_NONNULL_BEGIN
+#if (TARGET_OS_IOS)
 @interface PassThroughBackgroundView : UIView
 
-#if (TARGET_OS_IOS)
+
 @property (nonatomic, strong) WKWebView *webView;
 @property (nonatomic, strong) CLYButton *dismissButton;
-#endif
 
-NS_ASSUME_NONNULL_END
+
+
 @end
+#endif
+NS_ASSUME_NONNULL_END
diff --git a/PassThroughBackgroundView.m b/PassThroughBackgroundView.m
@@ -6,12 +6,13 @@
 
 #import "PassThroughBackgroundView.h"
 
+#if (TARGET_OS_IOS)
 @implementation PassThroughBackgroundView
 
 @synthesize webView;
 
 - (instancetype)initWithFrame:(CGRect)frame {
-#if (TARGET_OS_IOS)
+
     self = [super initWithFrame:frame];
     if (self) {
     }
@@ -30,5 +31,6 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
     return NO;
 }
 
-#endif
+
 @end
+#endif