Refactor: scroll to top for site title / site icon quick start

Author: Momo Ozawa

WordPress/Classes/Extensions/UIScrollView+Helpers.swift

@@ -21,7 +21,7 @@ extension UIScrollView {
                                         height: safeAreaLayoutGuide.layoutFrame.height)
                 scrollRectToVisible(targetRect, animated: animated)
             } else {
-                scrollToBottom()
+                scrollToBottom(animated: true)
             }
 
             // This ensures scrolling to the correct position, especially when there are layout changes
@@ -32,10 +32,15 @@ extension UIScrollView {
         }
     }
 
-    @objc func scrollToBottom() {
+    @objc func scrollToTop(animated: Bool) {
+        let topOffset = CGPoint(x: 0, y: -adjustedContentInset.top)
+        setContentOffset(topOffset, animated: animated)
+    }
+
+    @objc func scrollToBottom(animated: Bool) {
         let bottomOffset = CGPoint(x: 0, y: contentSize.height - bounds.size.height + adjustedContentInset.bottom)
         if bottomOffset.y > 0 {
-            setContentOffset(bottomOffset, animated: true)
+            setContentOffset(bottomOffset, animated: animated)
         }
     }
 

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

@@ -22,13 +22,14 @@ extension SitePickerViewController {
             if let info = notification.userInfo?[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
                 switch info {
                 case .noSuchElement:
-                    self?.additionalSafeAreaInsets = UIEdgeInsets.zero
+                    self?.additionalSafeAreaInsets = .zero
                 case .siteIcon, .siteTitle:
                     // handles the padding in case the element is not in the table view
                     guard let parentVC = self?.parent as? MySiteViewController else {
                         return
                     }
-                    parentVC.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: BlogDetailsViewController.bottomPaddingForQuickStartNotices, right: 0)
+                    parentVC.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: Constants.bottomPaddingForQuickStartNotices, right: 0)
+                    parentVC.scrollView.scrollToTop(animated: true)
                 default:
                     break
                 }
@@ -61,4 +62,8 @@ extension SitePickerViewController {
             QuickStartTourGuide.shared.suggest(tourToSuggest, for: blog)
         }
     }
+
+    private enum Constants {
+        static let bottomPaddingForQuickStartNotices: CGFloat = 80.0
+    }
 }