Merge pull request #1329 from woocommerce/issue/1325-darkmode-order-details

ctarda · web-flow · commit 11e916738f4c · 2019-10-03T19:05:10.000+02:00
Update background colors of all cells in OrderDetails screen
diff --git a/WooCommerce/Classes/Extensions/UITableViewCell+Helpers.swift b/WooCommerce/Classes/Extensions/UITableViewCell+Helpers.swift
@@ -11,4 +11,10 @@ extension UITableViewCell {
     class var reuseIdentifier: String {
         return classNameWithoutNamespaces
     }
+
+    /// Applies the default background color
+    ///
+    func applyDefaultBackgroundStyle() {
+        backgroundColor = StyleManager.wooWhite
+    }
 }
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/CustomerInfoTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/CustomerInfoTableViewCell.swift
@@ -44,4 +44,17 @@ class CustomerInfoTableViewCell: UITableViewCell {
             addressLabel.text = newValue
         }
     }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        configureBackground()
+    }
+}
+
+
+private extension CustomerInfoTableViewCell {
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
 }
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/CustomerNoteTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/CustomerNoteTableViewCell.swift
@@ -23,4 +23,16 @@ class CustomerNoteTableViewCell: UITableViewCell {
             noteLabel.text = newValue
         }
     }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        configureBackground()
+    }
+}
+
+
+private extension CustomerNoteTableViewCell {
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
 }
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/FulfillButtonTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/FulfillButtonTableViewCell.swift
@@ -11,7 +11,8 @@ final class FulfillButtonTableViewCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
 
-        fulfillButton.applyPrimaryButtonStyle()
+        configureBackground()
+        configureFulfillButton()
     }
 }
 
@@ -20,3 +21,14 @@ extension FulfillButtonTableViewCell {
         onFullfillTouchUp?()
     }
 }
+
+
+private extension FulfillButtonTableViewCell {
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
+
+    func configureFulfillButton() {
+        fulfillButton.applyPrimaryButtonStyle()
+    }
+}
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/OrderNoteTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/OrderNoteTableViewCell.swift
@@ -28,6 +28,7 @@ class OrderNoteTableViewCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
 
+        configureBackground()
         configureLabels()
         configureIconButton()
     }
@@ -92,6 +93,10 @@ private extension OrderNoteTableViewCell {
         }
     }
 
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
+
     /// Setup: Labels
     ///
     func configureLabels() {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/OrderTrackingTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/OrderTrackingTableViewCell.swift
@@ -43,12 +43,18 @@ final class OrderTrackingTableViewCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        
+        configureBackground()
         configureTopLine()
         configureMiddleLine()
         configureBottomLine()
         configureActionButton()
     }
 
+    private func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
+
     private func configureTopLine() {
         topLine.applySubheadlineStyle()
         topLine.numberOfLines = 0
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/PaymentTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/PaymentTableViewCell.swift
@@ -45,20 +45,14 @@ final class PaymentTableViewCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        subtotalLabel.applyBodyStyle()
-        subtotalValue.applyBodyStyle()
-        discountLabel.applyBodyStyle()
-        discountValue.applyBodyStyle()
-        shippingLabel.applyBodyStyle()
-        shippingValue.applyBodyStyle()
-        taxesLabel.applyBodyStyle()
-        taxesValue.applyBodyStyle()
-        totalLabel.applyHeadlineStyle()
-        totalValue.applyHeadlineStyle()
-
-        footerLabel?.text = nil
-        footerLabel?.applyFootnoteStyle()
-        separatorLine?.backgroundColor = StyleManager.cellSeparatorColor
+        configureBackground()
+        configureSubTotal()
+        configureDiscount()
+        configureShipping()
+        configureTaxes()
+        configureTotal()
+        configureLabel()
+        configureSeparator()
     }
 
     func configure(with viewModel: OrderPaymentDetailsViewModel) {
@@ -99,6 +93,47 @@ final class PaymentTableViewCell: UITableViewCell {
 }
 
 
+private extension PaymentTableViewCell {
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
+
+    func configureSubTotal() {
+        subtotalLabel.applyBodyStyle()
+        subtotalValue.applyBodyStyle()
+    }
+
+    func configureDiscount() {
+        discountLabel.applyBodyStyle()
+        discountValue.applyBodyStyle()
+    }
+
+    func configureShipping() {
+        shippingLabel.applyBodyStyle()
+        shippingValue.applyBodyStyle()
+    }
+
+    func configureTaxes() {
+        taxesLabel.applyBodyStyle()
+        taxesValue.applyBodyStyle()
+    }
+
+    func configureTotal() {
+        totalLabel.applyHeadlineStyle()
+        totalValue.applyHeadlineStyle()
+    }
+
+    func configureLabel() {
+        footerLabel?.text = nil
+        footerLabel?.applyFootnoteStyle()
+    }
+
+    func configureSeparator() {
+        separatorLine?.backgroundColor = StyleManager.cellSeparatorColor
+    }
+}
+
+
 private extension PaymentTableViewCell {
     enum Titles {
         static let subtotalLabel = NSLocalizedString("Subtotal",
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/ProductDetailsTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/ProductDetailsTableViewCell.swift
@@ -85,20 +85,49 @@ class ProductDetailsTableViewCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        configureBackground()
+        configureProductImageView()
+        configureNameLabel()
+        configureQuantityLabel()
+        configurePriceLabel()
+        configureSelectionStyle()
+    }
+}
+
+
+private extension ProductDetailsTableViewCell {
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
+
+    func configureProductImageView() {
         productImageView.image = .productPlaceholderImage
         productImageView.tintColor = StyleManager.wooGreyBorder
-        selectionStyle = .none
+    }
 
+    func configureNameLabel() {
         nameLabel.applyBodyStyle()
-        quantityLabel.applyBodyStyle()
-        priceLabel.applySecondaryFootnoteStyle()
-        skuLabel.applySecondaryFootnoteStyle()
-
         nameLabel?.text = ""
+    }
+
+    func configureQuantityLabel() {
+        quantityLabel.applyBodyStyle()
         quantityLabel?.text = ""
+    }
+
+    func configurePriceLabel() {
+        priceLabel.applySecondaryFootnoteStyle()
         priceLabel?.text = ""
+    }
+
+    func configureSKULabel() {
+        skuLabel.applySecondaryFootnoteStyle()
         skuLabel?.text = ""
     }
+
+    func configureSelectionStyle() {
+        selectionStyle = .none
+    }
 }
 
 
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/SummaryTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/SummaryTableViewCell.swift
@@ -65,6 +65,8 @@ final class SummaryTableViewCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+
+        configureBackground()
         configureLabels()
         configureIcon()
     }
@@ -104,6 +106,10 @@ private extension SummaryTableViewCell {
         paymentStatusLabel.layer.borderColor = borderColor
     }
 
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
+
     /// Setup: Labels
     ///
     func configureLabels() {
diff --git a/WooCommerce/Classes/ViewRelated/ReusableViews/LeftImageTableViewCell.swift b/WooCommerce/Classes/ViewRelated/ReusableViews/LeftImageTableViewCell.swift
@@ -31,9 +31,14 @@ class LeftImageTableViewCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        configureBackground()
         imageView?.tintColor = StyleManager.wooCommerceBrandColor
         textLabel?.applyBodyStyle()
     }
+
+    private func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
 }
 
 // MARK: - Public Methods
diff --git a/WooCommerce/Classes/ViewRelated/ReusableViews/WooBasicTableViewCell.swift b/WooCommerce/Classes/ViewRelated/ReusableViews/WooBasicTableViewCell.swift
@@ -26,10 +26,15 @@ class WooBasicTableViewCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
 
+        configureBackground()
         configureSelectionStyle()
         configureLabel()
     }
 
+    func configureBackground() {
+        applyDefaultBackgroundStyle()
+    }
+
     /// Set up the cell selection style
     ///
     func configureSelectionStyle() {

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,10 @@ extension UITableViewCell {`
`11`	`11`	`class var reuseIdentifier: String {`
`12`	`12`	`return classNameWithoutNamespaces`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+ /// Applies the default background color`
	`16`	`+ ///`
	`17`	`+ func applyDefaultBackgroundStyle() {`
	`18`	`+ backgroundColor = StyleManager.wooWhite`
	`19`	`+ }`
`14`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,17 @@ class CustomerInfoTableViewCell: UITableViewCell {`
`44`	`44`	`addressLabel.text = newValue`
`45`	`45`	`}`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ override func awakeFromNib() {`
	`49`	`+ super.awakeFromNib()`
	`50`	`+`
	`51`	`+ configureBackground()`
	`52`	`+ }`
	`53`	`+}`
	`54`	`+`
	`55`	`+`
	`56`	`+private extension CustomerInfoTableViewCell {`
	`57`	`+ func configureBackground() {`
	`58`	`+ applyDefaultBackgroundStyle()`
	`59`	`+ }`
`47`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,16 @@ class CustomerNoteTableViewCell: UITableViewCell {`
`23`	`23`	`noteLabel.text = newValue`
`24`	`24`	`}`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ override func awakeFromNib() {`
	`28`	`+ super.awakeFromNib()`
	`29`	`+ configureBackground()`
	`30`	`+ }`
	`31`	`+}`
	`32`	`+`
	`33`	`+`
	`34`	`+private extension CustomerNoteTableViewCell {`
	`35`	`+ func configureBackground() {`
	`36`	`+ applyDefaultBackgroundStyle()`
	`37`	`+ }`
`26`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ final class FulfillButtonTableViewCell: UITableViewCell {`
`11`	`11`	`override func awakeFromNib() {`
`12`	`12`	`super.awakeFromNib()`
`13`	`13`
`14`		`- fulfillButton.applyPrimaryButtonStyle()`
	`14`	`+ configureBackground()`
	`15`	`+ configureFulfillButton()`
`15`	`16`	`}`
`16`	`17`	`}`
`17`	`18`
`@@ -20,3 +21,14 @@ extension FulfillButtonTableViewCell {`
`20`	`21`	`onFullfillTouchUp?()`
`21`	`22`	`}`
`22`	`23`	`}`
	`24`	`+`
	`25`	`+`
	`26`	`+private extension FulfillButtonTableViewCell {`
	`27`	`+ func configureBackground() {`
	`28`	`+ applyDefaultBackgroundStyle()`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ func configureFulfillButton() {`
	`32`	`+ fulfillButton.applyPrimaryButtonStyle()`
	`33`	`+ }`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ class OrderNoteTableViewCell: UITableViewCell {`
`28`	`28`	`override func awakeFromNib() {`
`29`	`29`	`super.awakeFromNib()`
`30`	`30`
	`31`	`+ configureBackground()`
`31`	`32`	`configureLabels()`
`32`	`33`	`configureIconButton()`
`33`	`34`	`}`
`@@ -92,6 +93,10 @@ private extension OrderNoteTableViewCell {`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`
	`96`	`+ func configureBackground() {`
	`97`	`+ applyDefaultBackgroundStyle()`
	`98`	`+ }`
	`99`	`+`
`95`	`100`	`/// Setup: Labels`
`96`	`101`	`///`
`97`	`102`	`func configureLabels() {`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,14 @@ class LeftImageTableViewCell: UITableViewCell {`
`31`	`31`
`32`	`32`	`override func awakeFromNib() {`
`33`	`33`	`super.awakeFromNib()`
	`34`	`+ configureBackground()`
`34`	`35`	`imageView?.tintColor = StyleManager.wooCommerceBrandColor`
`35`	`36`	`textLabel?.applyBodyStyle()`
`36`	`37`	`}`
	`38`	`+`
	`39`	`+ private func configureBackground() {`
	`40`	`+ applyDefaultBackgroundStyle()`
	`41`	`+ }`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`// MARK: - Public Methods`