Refactor: apply insets to MySiteVC if MSD is enabled

Author: Momo Ozawa

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+FancyAlerts.swift

@@ -23,7 +23,13 @@ extension BlogDetailsViewController {
             if let info = notification.userInfo?[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
                 switch info {
                 case .noSuchElement:
-                    self?.additionalSafeAreaInsets = UIEdgeInsets.zero
+                    if FeatureFlag.mySiteDashboard.enabled,
+                       let parentVC = self?.parent as? MySiteViewController {
+                        parentVC.additionalSafeAreaInsets = UIEdgeInsets.zero
+                    } else {
+                        self?.additionalSafeAreaInsets = UIEdgeInsets.zero
+                    }
+
                 case .siteIcon, .siteTitle:
                     // handles the padding in case the element is not in the table view
                     self?.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: BlogDetailsViewController.bottomPaddingForQuickStartNotices, right: 0)

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m

@@ -421,9 +421,23 @@ - (void)viewWillAppear:(BOOL)animated
     [super viewWillAppear:animated];
 
     if ([[QuickStartTourGuide shared] currentElementInt] != NSNotFound) {
-        self.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
+        
+        if ([Feature enabled:FeatureFlagMySiteDashboard]) {
+            MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
+            parentVC.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
+        } else {
+            self.additionalSafeAreaInsets = UIEdgeInsetsMake(0, 0, [BlogDetailsViewController bottomPaddingForQuickStartNotices], 0);
+        }
+        
     } else {
-        self.additionalSafeAreaInsets = UIEdgeInsetsZero;
+        
+        if ([Feature enabled:FeatureFlagMySiteDashboard]) {
+            MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
+            parentVC.additionalSafeAreaInsets = UIEdgeInsetsZero;
+        } else {
+            self.additionalSafeAreaInsets = UIEdgeInsetsZero;
+        }
+        
     }
 
     if (self.splitViewControllerIsHorizontallyCompact) {
@@ -1922,7 +1936,12 @@ - (void)showViewSiteFromSource:(BlogDetailsNavigationSource)source
         [[QuickStartTourGuide shared] completeViewSiteTourForBlog:self.blog];
     }
 
-    self.additionalSafeAreaInsets = UIEdgeInsetsZero;
+    if ([Feature enabled:FeatureFlagMySiteDashboard]) {
+        MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
+        parentVC.additionalSafeAreaInsets = UIEdgeInsetsZero;
+    } else {
+        self.additionalSafeAreaInsets = UIEdgeInsetsZero;
+    }    
 }
 
 - (void)showViewAdmin

WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+QuickStart.swift

@@ -25,7 +25,10 @@ extension SitePickerViewController {
                     self?.additionalSafeAreaInsets = UIEdgeInsets.zero
                 case .siteIcon, .siteTitle:
                     // handles the padding in case the element is not in the table view
-                    self?.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: BlogDetailsViewController.bottomPaddingForQuickStartNotices, right: 0)
+                    guard let parentVC = self?.parent as? MySiteViewController else {
+                        return
+                    }
+                    parentVC.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: BlogDetailsViewController.bottomPaddingForQuickStartNotices, right: 0)
                 default:
                     break
                 }

WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift

@@ -242,7 +242,10 @@ extension SitePickerViewController {
             tourGuide.completeViewSiteTour(forBlog: blog)
         }
 
-        additionalSafeAreaInsets = .zero
+        guard let parentVC = parent as? MySiteViewController else {
+            return
+        }
+        parentVC.additionalSafeAreaInsets = .zero
     }
 }