Make delta tag and line chart colors computed properties of DeltaPercentage.Direction

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubViewModel.swift

@@ -197,17 +197,17 @@ private extension AnalyticsHubViewModel {
                                             leadingValue: StatsDataTextFormatter.createTotalRevenueText(orderStats: currentPeriodStats,
                                                                                                         selectedIntervalIndex: nil),
                                             leadingDelta: totalDelta.string,
-                                            leadingDeltaColor: Constants.deltaColor(for: totalDelta.direction),
-                                            leadingDeltaTextColor: Constants.deltaTextColor(for: totalDelta.direction),
+                                            leadingDeltaColor: totalDelta.direction.deltaBackgroundColor,
+                                            leadingDeltaTextColor: totalDelta.direction.deltaTextColor,
                                             leadingChartData: StatsIntervalDataParser.getChartData(for: .totalRevenue, from: currentPeriodStats),
-                                            leadingChartColor: Constants.chartColor(for: totalDelta.direction),
+                                            leadingChartColor: totalDelta.direction.chartColor,
                                             trailingTitle: Localization.RevenueCard.trailingTitle,
                                             trailingValue: StatsDataTextFormatter.createNetRevenueText(orderStats: currentPeriodStats),
                                             trailingDelta: netDelta.string,
-                                            trailingDeltaColor: Constants.deltaColor(for: netDelta.direction),
-                                            trailingDeltaTextColor: Constants.deltaTextColor(for: netDelta.direction),
+                                            trailingDeltaColor: netDelta.direction.deltaBackgroundColor,
+                                            trailingDeltaTextColor: netDelta.direction.deltaTextColor,
                                             trailingChartData: StatsIntervalDataParser.getChartData(for: .netRevenue, from: currentPeriodStats),
-                                            trailingChartColor: Constants.chartColor(for: netDelta.direction),
+                                            trailingChartColor: netDelta.direction.chartColor,
                                             isRedacted: false,
                                             showSyncError: showSyncError,
                                             syncErrorMessage: Localization.RevenueCard.noRevenue)
@@ -223,17 +223,17 @@ private extension AnalyticsHubViewModel {
                                             leadingValue: StatsDataTextFormatter.createOrderCountText(orderStats: currentPeriodStats,
                                                                                                       selectedIntervalIndex: nil),
                                             leadingDelta: ordersCountDelta.string,
-                                            leadingDeltaColor: Constants.deltaColor(for: ordersCountDelta.direction),
-                                            leadingDeltaTextColor: Constants.deltaTextColor(for: ordersCountDelta.direction),
+                                            leadingDeltaColor: ordersCountDelta.direction.deltaBackgroundColor,
+                                            leadingDeltaTextColor: ordersCountDelta.direction.deltaTextColor,
                                             leadingChartData: StatsIntervalDataParser.getChartData(for: .orderCount, from: currentPeriodStats),
-                                            leadingChartColor: Constants.chartColor(for: ordersCountDelta.direction),
+                                            leadingChartColor: ordersCountDelta.direction.chartColor,
                                             trailingTitle: Localization.OrderCard.trailingTitle,
                                             trailingValue: StatsDataTextFormatter.createAverageOrderValueText(orderStats: currentPeriodStats),
                                             trailingDelta: orderValueDelta.string,
-                                            trailingDeltaColor: Constants.deltaColor(for: orderValueDelta.direction),
-                                            trailingDeltaTextColor: Constants.deltaTextColor(for: orderValueDelta.direction),
+                                            trailingDeltaColor: orderValueDelta.direction.deltaBackgroundColor,
+                                            trailingDeltaTextColor: orderValueDelta.direction.deltaTextColor,
                                             trailingChartData: StatsIntervalDataParser.getChartData(for: .averageOrderValue, from: currentPeriodStats),
-                                            trailingChartColor: Constants.chartColor(for: orderValueDelta.direction),
+                                            trailingChartColor: orderValueDelta.direction.chartColor,
                                             isRedacted: false,
                                             showSyncError: showSyncError,
                                             syncErrorMessage: Localization.OrderCard.noOrders)
@@ -251,8 +251,8 @@ private extension AnalyticsHubViewModel {
 
         return AnalyticsProductCardViewModel(itemsSold: itemsSold,
                                              delta: itemsSoldDelta.string,
-                                             deltaBackgroundColor: Constants.deltaColor(for: itemsSoldDelta.direction),
-                                             deltaTextColor: Constants.deltaTextColor(for: itemsSoldDelta.direction),
+                                             deltaBackgroundColor: itemsSoldDelta.direction.deltaBackgroundColor,
+                                             deltaTextColor: itemsSoldDelta.direction.deltaTextColor,
                                              itemsSoldData: itemSoldRows(from: itemsSoldStats),
                                              isRedacted: false,
                                              showStatsError: showStatsError,
@@ -285,36 +285,6 @@ private extension AnalyticsHubViewModel {
 private extension AnalyticsHubViewModel {
     enum Constants {
         static let maxNumberOfTopItemsSold = 5
-
-        static func deltaColor(for direction: StatsDataTextFormatter.DeltaPercentage.Direction) -> UIColor {
-            switch direction {
-            case .positive:
-                return .withColorStudio(.green, shade: .shade50)
-            case .negative:
-                return .withColorStudio(.red, shade: .shade40)
-            case .zero:
-                return .withColorStudio(.gray, shade: .shade0)
-            }
-        }
-        static func deltaTextColor(for direction: StatsDataTextFormatter.DeltaPercentage.Direction) -> UIColor {
-            switch direction {
-            case .positive, .negative:
-                return .textInverted
-            case .zero:
-                return .text
-            }
-        }
-
-        static func chartColor(for direction: StatsDataTextFormatter.DeltaPercentage.Direction) -> UIColor {
-            switch direction {
-            case .positive:
-                return .withColorStudio(.green, shade: .shade50)
-            case .negative:
-                return .withColorStudio(.red, shade: .shade40)
-            case .zero:
-                return .withColorStudio(.gray, shade: .shade30)
-            }
-        }
     }
 
     enum Localization {

WooCommerce/Classes/ViewRelated/Dashboard/Factories/StatsDataTextFormatter.swift

@@ -220,6 +220,40 @@ extension StatsDataTextFormatter {
             case positive
             case negative
             case zero
+
+            /// Background color for a `DeltaTag`
+            var deltaBackgroundColor: UIColor {
+                switch self {
+                case .positive:
+                    return Constants.green
+                case .negative:
+                    return Constants.red
+                case .zero:
+                    return Constants.lightGray
+                }
+            }
+
+            /// Text color for a `DeltaTag`
+            var deltaTextColor: UIColor {
+                switch self {
+                case .positive, .negative:
+                    return .textInverted
+                case .zero:
+                    return .text
+                }
+            }
+
+            /// Line color for an `AnalyticsLineChart`
+            var chartColor: UIColor {
+                switch self {
+                case .positive:
+                    return Constants.green
+                case .negative:
+                    return Constants.red
+                case .zero:
+                    return Constants.darkGray
+                }
+            }
         }
     }
 }
@@ -292,6 +326,10 @@ private extension StatsDataTextFormatter {
 
     enum Constants {
         static let placeholderText = "-"
+        static let green: UIColor = .withColorStudio(.green, shade: .shade50)
+        static let red: UIColor = .withColorStudio(.red, shade: .shade40)
+        static let lightGray: UIColor = .withColorStudio(.gray, shade: .shade0)
+        static let darkGray: UIColor = .withColorStudio(.gray, shade: .shade30)
     }