Merge branch 'trunk' into feature/dashboard-arch-refactor/base

Author: hassaanelgarem

Podfile

@@ -47,7 +47,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.50.0-beta'
+    pod 'WordPressKit', '~> 4.50.0'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'task/18324-site-creation-with-site-name'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''

Podfile.lock

@@ -487,7 +487,7 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.50.0-beta.2):
+  - WordPressKit (4.50.0):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -591,7 +591,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.8)
   - WordPressAuthenticator (~> 2.0.0)
-  - WordPressKit (~> 4.50.0-beta)
+  - WordPressKit (~> 4.50.0)
   - WordPressMocks (~> 0.0.15)
   - WordPressShared (~> 1.17.1)
   - WordPressUI (~> 1.12.5)
@@ -603,7 +603,6 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
-    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -641,6 +640,7 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
+    - WordPressKit
     - WordPressMocks
     - WordPressShared
     - WordPressUI
@@ -853,7 +853,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
   WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
   WordPressAuthenticator: 5163f732e4e529781f931f158f54b1a1545bc536
-  WordPressKit: ef5f26d7005b6e24c6c827aea96e8cd0b6365aba
+  WordPressKit: b5d9b13e7e627134c583d7c6736efa720b306615
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -869,6 +869,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 2f878ca897cb51df24b54e1372ab09d349df080f
+PODFILE CHECKSUM: 4ec8f8e1fe1324b2079ae08999bcc274e8232655
 
 COCOAPODS: 1.11.2

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 -----
 * [*] [internal] My Site Dashboard: Made some changes to the code architecture of the dashboard. The majority of the changes are related to the posts cards. It should have no visible changes but could cause regressions. [#18405]
 
+
 19.7
 -----
 * [*] a11y: VoiceOver has been improved on the Menus view and now announces changes to ordering. [#18155]

WordPress/Classes/Utility/AB Testing/ABTest.swift

@@ -1,5 +1,7 @@
 import AutomatticTracks
 
+// Attention: AB test is available only for WPiOS
+// Jetpack is not supported
 enum ABTest: String, CaseIterable {
     case unknown = "unknown"
     case siteNameV1 = "wpios_site_name_v1"
@@ -14,7 +16,8 @@ extension ABTest {
     /// Start the AB Testing platform if any experiment exists
     ///
     static func start() {
-        guard ABTest.allCases.count > 1, AccountHelper.isLoggedIn else {
+        guard ABTest.allCases.count > 1, AccountHelper.isLoggedIn,
+              AppConfiguration.isWordPress else {
             return
         }
 

WordPress/Classes/Utility/App Configuration/AppConfiguration.swift

@@ -5,6 +5,7 @@ import Foundation
  */
 @objc class AppConfiguration: NSObject {
     @objc static let isJetpack: Bool = false
+    @objc static let isWordPress: Bool = true
     @objc static let showJetpackSitesOnly: Bool = false
     @objc static let allowsNewPostShortcut: Bool = true
     @objc static let allowsConnectSite: Bool = true

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Quick Start/QuickStartTourStateView.swift

@@ -38,7 +38,7 @@ final class QuickStartTourStateView: UIView {
     func configure(blog: Blog, sourceController: UIViewController, checklistTappedTracker: QuickStartChecklistTappedTracker? = nil) {
 
         customizeChecklistView.configure(
-            tours: QuickStartTourGuide.customizeListTours,
+            tours: QuickStartTourGuide.customizeListTours(for: blog),
             blog: blog,
             title: Strings.customizeTitle,
             hint: Strings.customizeHint

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

@@ -19,21 +19,6 @@ extension BlogDetailsViewController {
                 switch info {
                 case .pages, .editHomepage, .sharing, .stats:
                     self?.scroll(to: info)
-                case .viewSite:
-                    self?.scroll(to: info)
-
-                    guard let self = self,
-                        let navigationController = self.navigationController,
-                        navigationController.visibleViewController != self else {
-                        return
-                    }
-
-                    self.dismiss(animated: true) {
-                        self.tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
-                        self.shouldScrollToViewSite = true
-
-                        navigationController.popToRootViewController(animated: true)
-                    }
                 default:
                     break
                 }

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

@@ -406,11 +406,6 @@ - (void)viewDidAppear:(BOOL)animated
     [self cancelCompletedToursIfNeeded];
     [self createUserActivity];
     [self startAlertTimer];
-
-    if (self.shouldScrollToViewSite == YES) {
-        [self scrollToElement:QuickStartTourElementViewSite];
-        self.shouldScrollToViewSite = NO;
-    }
 
     QuickStartTourGuide *tourGuide = [QuickStartTourGuide shared];
 
@@ -1026,7 +1021,6 @@ - (BlogDetailsSection *)externalSectionViewModel
                                                                callback:^{
         [weakSelf showViewSiteFromSource:BlogDetailsNavigationSourceRow];
     }];
-    viewSiteRow.quickStartIdentifier = QuickStartTourElementViewSite;
     viewSiteRow.showsSelectionState = NO;
     [rows addObject:viewSiteRow];
 
@@ -1624,17 +1618,19 @@ - (void)showViewSiteFromSource:(BlogDetailsNavigationSource)source
                        animated:YES
                      completion:nil];
 
+    MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
+    
     QuickStartTourGuide *guide = [QuickStartTourGuide shared];
 
     if ([guide isCurrentElement:QuickStartTourElementViewSite]) {
         [[QuickStartTourGuide shared] visited:QuickStartTourElementViewSite];
+        [parentVC toggleSpotlightOnSitePicker];
     } else {
         // Just mark as completed if we've viewed the site and aren't
         //  currently working on the View Site tour.
         [[QuickStartTourGuide shared] completeViewSiteTourForBlog:self.blog];
     }
 
-    MySiteViewController *parentVC = (MySiteViewController *)self.parentViewController;
     parentVC.additionalSafeAreaInsets = UIEdgeInsetsZero;
 }
 

WordPress/Classes/ViewRelated/Blog/Blog Details/Detail Header/BlogDetailHeaderView.swift

@@ -38,6 +38,7 @@ class BlogDetailHeaderView: UIView {
         didSet {
             refreshIconImage()
             toggleSpotlightOnSiteTitle()
+            toggleSpotlightOnSiteUrl()
             refreshSiteTitle()
 
             if let displayURL = blog?.displayURL as String? {
@@ -73,11 +74,15 @@ class BlogDetailHeaderView: UIView {
         titleView.titleButton.setTitle(title, for: .normal)
     }
 
-    @objc func toggleSpotlightOnSiteTitle() {
+    func toggleSpotlightOnSiteTitle() {
         titleView.titleButton.shouldShowSpotlight = QuickStartTourGuide.shared.isCurrentElement(.siteTitle)
     }
 
-    @objc func toggleSpotlightOnSiteIcon() {
+    func toggleSpotlightOnSiteUrl() {
+        titleView.subtitleButton.shouldShowSpotlight = QuickStartTourGuide.shared.isCurrentElement(.viewSite)
+    }
+
+    func toggleSpotlightOnSiteIcon() {
         titleView.siteIconView.spotlightIsShown = QuickStartTourGuide.shared.isCurrentElement(.siteIcon)
     }
 
@@ -240,8 +245,8 @@ fileprivate extension BlogDetailHeaderView {
             return siteIconView
         }()
 
-        let subtitleButton: UIButton = {
-            let button = UIButton()
+        let subtitleButton: SpotlightableButton = {
+            let button = SpotlightableButton(type: .custom)
 
             button.titleLabel?.font = WPStyleGuide.fontForTextStyle(.footnote)
             button.titleLabel?.adjustsFontForContentSizeCategory = true

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController+QuickStart.swift

@@ -11,7 +11,7 @@ extension MySiteViewController {
                 switch element {
                 case .noSuchElement:
                     self?.additionalSafeAreaInsets = .zero
-                case .siteIcon, .siteTitle:
+                case .siteIcon, .siteTitle, .viewSite:
                     self?.scrollView.scrollToTop(animated: true)
 
                     self?.additionalSafeAreaInsets = UIEdgeInsets(top: 0, left: 0, bottom: Constants.bottomPaddingForQuickStartNotices, right: 0)