Merge pull request #18590 from wordpress-mobile/issue/18565-qs-modify-reader-tour

QuickStart for Existing Users V2: Mark reader task as done when user taps on a tag

Author: hassaanelgarem

WordPress/Classes/ViewRelated/Reader/Select Interests/ReaderSelectInterestsViewController.swift

@@ -344,6 +344,9 @@ extension ReaderSelectInterestsViewController: UICollectionViewDelegate {
             spotlightIsShown = false
         }
 
+        // End reader quick start tour if user selects a topic.
+        QuickStartTourGuide.shared.visited(.readerDiscoverSettings)
+
         dataSource.interest(for: indexPath.row).toggleSelected()
         updateNextButtonState()
 

WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabViewController.swift

@@ -38,6 +38,7 @@ class ReaderTabViewController: UIViewController {
 
         NotificationCenter.default.addObserver(self, selector: #selector(defaultAccountDidChange(_:)), name: NSNotification.Name.WPAccountDefaultWordPressComAccountChanged, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
+        startObservingQuickStart()
 
         viewModel.fetchReaderMenu()
     }
@@ -123,7 +124,6 @@ class ReaderTabViewController: UIViewController {
 // MARK: - Navigation Buttons
 extension ReaderTabViewController {
     @objc private func didTapSettingsButton() {
-        settingsButton.shouldShowSpotlight = false
         viewModel.presentManage(from: self)
     }
 
@@ -132,6 +132,18 @@ extension ReaderTabViewController {
     }
 }
 
+// MARK: Observing Quick Start
+extension ReaderTabViewController {
+    private func startObservingQuickStart() {
+        NotificationCenter.default.addObserver(forName: .QuickStartTourElementChangedNotification, object: nil, queue: nil) { [weak self] notification in
+            if let info = notification.userInfo,
+               let element = info[QuickStartTourGuide.notificationElementKey] as? QuickStartTourElement {
+                self?.settingsButton.shouldShowSpotlight = element == .readerDiscoverSettings
+            }
+        }
+    }
+}
+
 
 // MARK: - State Restoration
 extension ReaderTabViewController: UIViewControllerRestoration {