Now clears chart markers on viewDidDisappear

Author: bummytime

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/ChartMarker.swift

@@ -1,8 +1,8 @@
 import Foundation
 import Charts
 
-/// This class is a custom view which is displayed over a chart element (e.g. a Bar) when it is highlighted. It
-/// basically is a duplicate of the `BalloonMarker` class found in the Charts demo project.
+
+/// This class is a custom view which is displayed over a chart element (e.g. a Bar) when it is highlighted.
 ///
 /// See: https://github.com/danielgindi/Charts/blob/master/ChartsDemo-iOS/Swift/Components/BalloonMarker.swift
 ///

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/PeriodDataViewController.swift

@@ -75,6 +75,11 @@ class PeriodDataViewController: UIViewController, IndicatorInfoProvider {
         super.viewDidAppear(animated)
         reloadAllFields()
     }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        clearChartMarkers()
+    }
 }
 
 
@@ -176,7 +181,7 @@ extension PeriodDataViewController: ChartViewDelegate {
     func chartValueSelected(_ chartView: ChartViewBase, entry: ChartDataEntry, highlight: Highlight) {
         guard entry.y != 0.0 else {
             // Do not display the marker if the Y-value is zero
-            chartView.highlightValue(nil, callDelegate: false)
+            clearChartMarkers()
             return
         }
 
@@ -209,8 +214,7 @@ extension PeriodDataViewController: IAxisValueFormatter {
                     }
                 case .week:
                     if let periodDate = DateFormatter.Stats.statsWeekFormatter.date(from: item.period) {
-                        let firstMonday = Calendar.current.date(byAdding: .day, value: 1, to: periodDate) ?? periodDate
-                        dateString = DateFormatter.Charts.chartsWeekFormatter.string(from: firstMonday)
+                        dateString = DateFormatter.Charts.chartsWeekFormatter.string(from: periodDate)
                     }
                 case .month:
                     if let periodDate = DateFormatter.Stats.statsMonthFormatter.date(from: item.period) {
@@ -292,6 +296,10 @@ private extension PeriodDataViewController {
         if lastUpdated != nil { lastUpdated.text = summaryDateUpdated }
     }
 
+    func clearChartMarkers() {
+        barChartView.highlightValue(nil, callDelegate: false)
+    }
+
     func generateBarDataSet() -> BarChartData? {
         guard let orderStats = orderStats, let statItems = orderStats.items, !statItems.isEmpty else {
             return nil

WooCommerce/Classes/ViewRelated/Dashboard/MyStore/StoreStatsViewController.swift

@@ -180,7 +180,7 @@ private extension StoreStatsViewController {
         static let quantityDefaultForDay = 30
         static let quantityDefaultForWeek = 13
         static let quantityDefaultForMonth = 12
-        static let quantityDefaultForYear = 10
+        static let quantityDefaultForYear = 5
     }
 
     enum TabStrip {