Merge pull request #17867 from wordpress-mobile/issue/17845-move-add-new-insight-card

Add New Insights Card to navigation bar

Author: sla8c

RELEASE-NOTES.txt

@@ -8,6 +8,7 @@
 * [**] People: you can now manage Email Followers on the People section! [#17854]
 * [*] Stats: fix navigation between Stats tab. [#17856]
 * [*] Quick Start: Fixed a bug where a user logging in via a self-hosted site not connected to Jetpack would see Quick Start when selecting "No thanks" on the Quick Start prompt. [#17855] 
+* [*] Stats: can now add insights card from navigation bar [#17867]
 
 19.1
 -----

WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift

@@ -83,6 +83,29 @@ class SiteStatsInsightsTableViewController: UITableViewController, StoryboardLoa
         viewModel?.refreshInsights()
     }
 
+    func showAddInsightView(source: String = "table_row") {
+        WPAnalytics.track(.statsItemTappedInsightsAddStat, withProperties: ["source": source])
+
+        if displayingEmptyView {
+            hideNoResults()
+            addViewModelListeners()
+            refreshInsights()
+        }
+
+        if insightsToShow.contains(.customize) {
+            // The view needs to be updated to remove the Customize card.
+            // However, if it's done here, there is a weird animation before AddInsight is presented.
+            // Instead, set 'viewNeedsUpdating' so the view is updated when 'addInsightDismissed' is called.
+            viewNeedsUpdating = true
+            dismissCustomizeCard()
+        }
+
+        let controller = AddInsightTableViewController(insightsDelegate: self,
+                insightsShown: insightsToShow.compactMap { $0.statSection })
+        let navigationController = UINavigationController(rootViewController: controller)
+        present(navigationController, animated: true, completion: nil)
+    }
+
 }
 
 // MARK: - Private Extension
@@ -281,22 +304,6 @@ private extension SiteStatsInsightsTableViewController {
 
     // MARK: - Insights Management
 
-    func showAddInsightView() {
-
-        if insightsToShow.contains(.customize) {
-            // The view needs to be updated to remove the Customize card.
-            // However, if it's done here, there is a weird animation before AddInsight is presented.
-            // Instead, set 'viewNeedsUpdating' so the view is updated when 'addInsightDismissed' is called.
-            viewNeedsUpdating = true
-            dismissCustomizeCard()
-        }
-
-        let controller = AddInsightTableViewController(insightsDelegate: self,
-                                                       insightsShown: insightsToShow.compactMap { $0.statSection })
-        let navigationController = UINavigationController(rootViewController: controller)
-        present(navigationController, animated: true, completion: nil)
-    }
-
     func moveInsightUp(_ insight: InsightType) {
         guard canMoveInsightUp(insight) else {
             return
@@ -633,15 +640,7 @@ extension SiteStatsInsightsTableViewController: ReaderDiscoverFlowDelegate {
 
 extension SiteStatsInsightsTableViewController: NoResultsViewControllerDelegate {
     func actionButtonPressed() {
-        guard !displayingEmptyView else {
-            WPAnalytics.track(.statsItemTappedInsightsAddStat)
-            showAddInsightView()
-            return
-        }
-
-        hideNoResults()
-        addViewModelListeners()
-        refreshInsights()
+        showAddInsightView()
     }
 }
 

WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift

@@ -376,7 +376,8 @@ private extension StatsTotalRow {
     }
 
     @IBAction func didTapDisclosureButton(_ sender: UIButton) {
-        if let statSection = rowData?.statSection {
+        if let statSection = rowData?.statSection,
+               statSection != .insightsAddInsight {
             captureAnalyticsEventsFor(statSection)
         }
 

WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift

@@ -69,17 +69,36 @@ class SiteStatsDashboardViewController: UIViewController {
     private var periodTableViewController = SiteStatsPeriodTableViewController.loadFromStoryboard()
     private var pageViewController: UIPageViewController?
 
+    @objc lazy var manageInsightsButton: UIBarButtonItem = {
+        let button = UIBarButtonItem(
+                image: .gridicon(.cog),
+                style: .plain,
+                target: self,
+                action: #selector(manageInsightsButtonTapped))
+        button.accessibilityHint = NSLocalizedString("Tap to customize insights", comment: "Accessibility hint to customize insights")
+        return button
+    }()
+
     // MARK: - View
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        configureNavBar()
         setupFilterBar()
         restoreSelectedDateFromUserDefaults()
         restoreSelectedPeriodFromUserDefaults()
         addWillEnterForegroundObserver()
         view.accessibilityIdentifier = "stats-dashboard"
     }
 
+    func configureNavBar() {
+        parent?.navigationItem.rightBarButtonItem = currentSelectedPeriod == .insights ? manageInsightsButton : nil
+    }
+
+    @objc func manageInsightsButtonTapped() {
+        insightsTableViewController.showAddInsightView(source: "nav_bar")
+    }
+
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         removeWillEnterForegroundObserver()
@@ -145,6 +164,8 @@ private extension SiteStatsDashboardViewController {
 
     @objc func selectedFilterDidChange(_ filterBar: FilterTabBar) {
         currentSelectedPeriod = StatsPeriodType(rawValue: filterBar.selectedIndex) ?? StatsPeriodType.insights
+
+        configureNavBar()
     }
 
 }

WordPress/Classes/ViewRelated/Stats/StatsViewController.m

@@ -59,7 +59,7 @@ - (void)viewDidLoad
     // Being shown in a modal window
     if (self.presentingViewController != nil) {
         UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doneButtonTapped:)];
-        self.navigationItem.rightBarButtonItem = doneButton;
+        self.navigationItem.leftBarButtonItem = doneButton;
         self.title = self.blog.settings.name;
     }