Merge pull request #547 from woocommerce/issue/review-updates

Design Review updates

Author: bummytime

WooCommerce/Classes/Model/Note+Woo.swift

@@ -22,6 +22,15 @@ extension Note {
         return snippet
     }
 
+    /// Returns the icon tint color to be used for this note
+    ///
+    var noticonTintColor: UIColor {
+        guard kind == .storeOrder else {
+            return StyleManager.wooGreyMid
+        }
+        return StyleManager.wooAccent
+    }
+
     /// Returns the number of stars for a review (or nil if the Note is not a review)
     ///
     var starRating: Int? {

WooCommerce/Classes/ViewRelated/Dashboard/Dashboard.storyboard

@@ -318,25 +318,25 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="347" height="108"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" text="You have 10 orders to fulfill" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XgA-ra-emd" customClass="PaddedLabel" customModule="WooCommerce" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="347" height="20.5"/>
+                                                        <rect key="frame" x="0.0" y="4" width="347" height="20.5"/>
                                                         <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Review, prepare, and ship these pending orders..." lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3ad-g9-Y4v" customClass="PaddedLabel" customModule="WooCommerce" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="20.5" width="347" height="87.5"/>
+                                                        <rect key="frame" x="0.0" y="32.5" width="347" height="42.5"/>
                                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="bottom" secondItem="3ad-g9-Y4v" secondAttribute="bottom" id="Plf-SO-Ahp"/>
-                                                    <constraint firstItem="XgA-ra-emd" firstAttribute="top" secondItem="4WL-4h-7Za" secondAttribute="top" id="Zzh-mG-Qzz"/>
+                                                    <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="3ad-g9-Y4v" secondAttribute="bottom" id="Plf-SO-Ahp"/>
+                                                    <constraint firstItem="XgA-ra-emd" firstAttribute="top" secondItem="4WL-4h-7Za" secondAttribute="top" constant="4" id="Zzh-mG-Qzz"/>
                                                     <constraint firstItem="3ad-g9-Y4v" firstAttribute="leading" secondItem="4WL-4h-7Za" secondAttribute="leading" id="huZ-G2-7YY"/>
                                                     <constraint firstAttribute="trailing" secondItem="XgA-ra-emd" secondAttribute="trailing" id="rz7-pS-zpH"/>
-                                                    <constraint firstItem="3ad-g9-Y4v" firstAttribute="top" secondItem="XgA-ra-emd" secondAttribute="bottom" id="vaT-7D-i38"/>
+                                                    <constraint firstItem="3ad-g9-Y4v" firstAttribute="top" secondItem="XgA-ra-emd" secondAttribute="bottom" constant="8" id="vaT-7D-i38"/>
                                                     <constraint firstAttribute="trailing" secondItem="3ad-g9-Y4v" secondAttribute="trailing" id="vji-5F-RT1"/>
                                                     <constraint firstItem="XgA-ra-emd" firstAttribute="leading" secondItem="4WL-4h-7Za" secondAttribute="leading" id="xBw-l4-s7G"/>
                                                 </constraints>

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

@@ -100,6 +100,9 @@ class PeriodDataViewController: UIViewController, IndicatorInfoProvider {
     init(granularity: StatGranularity) {
         self.granularity = granularity
         super.init(nibName: type(of: self).nibName, bundle: nil)
+
+        // Make sure the ResultsControllers are ready to observe changes to the data even before the view loads
+        self.configureResultsControllers()
     }
 
     /// NSCoder Conformance
@@ -112,9 +115,8 @@ class PeriodDataViewController: UIViewController, IndicatorInfoProvider {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        configureView()
-        configureResultsControllers()
-        configureBarChart()
+        self.configureView()
+        self.configureBarChart()
     }
 
     override func viewDidAppear(_ animated: Bool) {

WooCommerce/Classes/ViewRelated/Notifications/Cells/NoteTableViewCell.swift

@@ -46,6 +46,17 @@ class NoteTableViewCell: UITableViewCell {
         }
     }
 
+    /// Icon Color property.
+    ///
+    var noticonColor: UIColor? {
+        get {
+            return noticonLabel.textColor
+        }
+        set {
+            noticonLabel.textColor = newValue
+        }
+    }
+
     /// Attributed Subject
     ///
     var attributedSubject: NSAttributedString? {
@@ -113,7 +124,6 @@ private extension NoteTableViewCell {
     ///
     func refreshColors() {
         sidebarView.backgroundColor = read ? UIColor.clear : StyleManager.wooAccent
-        noticonLabel.textColor = read ? StyleManager.wooGreyMid : StyleManager.wooAccent
     }
 
     func configureStarView() {

WooCommerce/Classes/ViewRelated/Notifications/NotificationsViewController.swift

@@ -544,6 +544,7 @@ private extension NotificationsViewController {
 
         cell.read = note.read
         cell.noticon = note.noticon
+        cell.noticonColor = note.noticonTintColor
         cell.attributedSubject = renderSubject(note: note)
         cell.attributedSnippet = renderSnippet(note: note)
         cell.starRating = note.starRating

WooCommerce/Classes/ViewRelated/Orders/OrderDetails/AddNote/AddANoteViewController.swift

@@ -153,7 +153,7 @@ private extension AddANoteViewController {
         }
 
         cell.title = NSLocalizedString("Email note to customer", comment: "Label for yes/no switch - emailing the note to customer.")
-        cell.subtitle = NSLocalizedString("If disabled will add the note as private.", comment: "Detail label for yes/no switch.")
+        cell.subtitle = NSLocalizedString("If disabled the note will be private", comment: "Detail label for yes/no switch.")
         cell.accessibilityTraits = .button
         cell.accessibilityLabel = String.localizedStringWithFormat(NSLocalizedString("Email note to customer %@", comment: ""), isCustomerNote ? NSLocalizedString("On", comment: "Spoken label to indicate switch control is turned on") : NSLocalizedString("Off", comment: "Spoken label to indicate switch control is turned off."))
         cell.accessibilityHint = NSLocalizedString("Double tap to toggle setting.", comment: "VoiceOver accessibility hint, informing the user that double-tapping will toggle the switch off and on.")