feat: move everything to view

Author: arifBurakDemiray

CountlyWebViewManager.m

@@ -43,11 +43,6 @@ - (void)createWebViewWithURL:(NSURL *)url
     NSURLRequest *request = [NSURLRequest requestWithURL:url];
     [webView loadRequest:request];
 
-#if (TARGET_OS_IOS)
-    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(handleScreenChange) name:UIDeviceOrientationDidChangeNotification object:nil];
-    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(handleScreenChange) name:UIScreenModeDidChangeNotification object:nil];
-#endif
-    
     CLYButton *dismissButton = [CLYButton dismissAlertButton:@"X"];
     [self configureDismissButton:dismissButton forWebView:webView];
 
@@ -64,35 +59,6 @@ - (void)createWebViewWithURL:(NSURL *)url
     }];
 }
 
-- (void)handleScreenChange {
-    CGRect screenBounds = [UIScreen mainScreen].bounds;
-    if (@available(iOS 11.0, *)) {
-        CGFloat top = UIApplication.sharedApplication.keyWindow.safeAreaInsets.top;
-        
-        if (top) {
-            screenBounds.origin.y += top + 5;
-            screenBounds.size.height -= top + 5;
-        } else {
-            screenBounds.origin.y += 20.0;
-            screenBounds.size.height -= 20.0;
-        }
-    } else {
-        screenBounds.origin.y += 20.0;
-        screenBounds.size.height -= 20.0;
-    }
-    
-    CGFloat width = screenBounds.size.width;
-    CGFloat height = screenBounds.size.height;
-    
-    NSString *postMessage = [NSString stringWithFormat:
-                            @"javascript:window.postMessage({type: 'resize', width: %f, height: %f}, '*');",
-                             width,
-                             height];
-    NSURL *uri = [NSURL URLWithString:postMessage];
-    NSURLRequest *request = [NSURLRequest requestWithURL:uri];
-    [self.backgroundView.webView loadRequest:request];
-}
-
 - (void)configureWebView:(WKWebView *)webView {
     webView.layer.shadowColor = UIColor.blackColor.CGColor;
     webView.layer.shadowOpacity = 0.5;
@@ -332,10 +298,6 @@ - (void)resizeWebViewWithJSONString:(NSString *)jsonString {
 }
 
 - (void)closeWebView {
-#if (TARGET_OS_IOS)
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIScreenModeDidChangeNotification object:nil];
-#endif
     dispatch_async(dispatch_get_main_queue(), ^{
         if (self.dismissBlock) {
             self.dismissBlock();

PassThroughBackgroundView.m

@@ -14,8 +14,10 @@ @implementation PassThroughBackgroundView
 - (instancetype)initWithFrame:(CGRect)frame {
 
     self = [super initWithFrame:frame];
-    if (self) {
-    }
+#if (TARGET_OS_IOS)
+    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(handleScreenChange) name:UIDeviceOrientationDidChangeNotification object:nil];
+    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(handleScreenChange) name:UIScreenModeDidChangeNotification object:nil];
+#endif
     return self;
 }
 
@@ -31,6 +33,54 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
     return NO;
 }
 
+- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
+    [super traitCollectionDidChange:previousTraitCollection];
+    
+    if (self.traitCollection.horizontalSizeClass != previousTraitCollection.horizontalSizeClass) {
+        [self adjustWebViewForTraitCollection:self.traitCollection];
+    }
+}
+
+- (void)adjustWebViewForTraitCollection:(UITraitCollection *)traitCollection {
+    if (traitCollection.horizontalSizeClass == UIUserInterfaceSizeClassCompact) {
+        [self handleScreenChange];
+    }
+}
+
+- (void)handleScreenChange {
+    CGRect screenBounds = [UIScreen mainScreen].bounds;
+    if (@available(iOS 11.0, *)) {
+        CGFloat top = UIApplication.sharedApplication.keyWindow.safeAreaInsets.top;
+        
+        if (top) {
+            screenBounds.origin.y += top + 5;
+            screenBounds.size.height -= top + 5;
+        } else {
+            screenBounds.origin.y += 20.0;
+            screenBounds.size.height -= 20.0;
+        }
+    } else {
+        screenBounds.origin.y += 20.0;
+        screenBounds.size.height -= 20.0;
+    }
+    
+    CGFloat width = screenBounds.size.width;
+    CGFloat height = screenBounds.size.height;
+    
+    NSString *postMessage = [NSString stringWithFormat:
+                            @"javascript:window.postMessage({type: 'resize', width: %f, height: %f}, '*');",
+                             width,
+                             height];
+    NSURL *uri = [NSURL URLWithString:postMessage];
+    NSURLRequest *request = [NSURLRequest requestWithURL:uri];
+    [self.webView loadRequest:request];
+}
+
+
+// Always remove observers when the view is deallocated
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 
 @end
 #endif