Merge branch 'develop' of github.com:woocommerce/woocommerce-ios into issue/19-green-dot

* 'develop' of github.com:woocommerce/woocommerce-ios:
  Quick fix for notifications navbar button
  Tweaked NoteTableViewCell.xib for dynamic type
  OrderLoaderViewController: Updating reloadOrder Hook
  Revert "Revert to this commit to test OrderLoader Failure State"
  Revert to this commit to test OrderLoader Failure State
  Implementing OrderLoaderViewController
  NotificationsViewController: Wiring OrderLoaderVIewController
  OrderDetailsViewController: Adding comment
  Updating Project
  Orders.storyboard: Updating ViewController Identifier
  MetaContainer: New Key
  UIStoryboard: Woo Methods
  Use 'cocoapods-repo-update' CocoaPods plugin

Author: bummytime

Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org' do
   gem 'rake'
   gem 'cocoapods', '~> 1.5.2'
+  gem 'cocoapods-repo-update', '0.0.2'
   gem 'xcpretty-travis-formatter'
   gem 'danger'
   gem 'danger-swiftlint'

Gemfile.lock

@@ -50,6 +50,8 @@ GEM
     cocoapods-downloader (1.2.0)
     cocoapods-plugins (1.0.0)
       nap
+    cocoapods-repo-update (0.0.2)
+      cocoapods (~> 1.0, >= 1.3.0)
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
     cocoapods-trunk (1.3.0)
@@ -236,6 +238,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (~> 1.5.2)!
+  cocoapods-repo-update (= 0.0.2)!
   danger!
   danger-swiftlint!
   dotenv!

Networking/Networking/Model/MetaContainer.swift

@@ -49,6 +49,7 @@ extension MetaContainer {
     public enum Keys: String {
         case comment
         case home
+        case order
         case post
         case reply  = "reply_comment"
         case site

Podfile

@@ -4,7 +4,7 @@ use_frameworks!
 platform :ios, '11.0'
 workspace 'WooCommerce.xcworkspace'
 
-
+plugin 'cocoapods-repo-update'
 
 # Main Target!
 # ============

Podfile.lock

@@ -154,6 +154,6 @@ SPEC CHECKSUMS:
   XLPagerTabStrip: 22d4c58200d7c105e0e407ab6bfd01a5d85014be
   ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878
 
-PODFILE CHECKSUM: 6c1aafce7d9026c5a6ff7b5a454cf412b5b7bb11
+PODFILE CHECKSUM: 11e311a5637345ed4d3db5098c28bb9535261761
 
 COCOAPODS: 1.5.3

WooCommerce/Classes/Extensions/UIStoryboard+Woo.swift

@@ -0,0 +1,14 @@
+import Foundation
+import UIKit
+
+
+// MARK: - UIStoryboard Woo Methods
+//
+extension UIStoryboard {
+
+    /// Returns a (new) instance of the Orders Storyboard.
+    ///
+    static var orders: UIStoryboard {
+        return UIStoryboard(name: "Orders", bundle: .main)
+    }
+}

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

@@ -18,27 +18,28 @@
                 <rect key="frame" x="0.0" y="0.0" width="375" height="87.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MDO-G5-bNl">
-                        <rect key="frame" x="14" y="11" width="25" height="20.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MDO-G5-bNl">
+                        <rect key="frame" x="14" y="11" width="25" height="25"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="25" id="Eqv-DJ-O5N"/>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="25" id="Eqv-DJ-O5N"/>
+                            <constraint firstAttribute="width" secondItem="MDO-G5-bNl" secondAttribute="height" multiplier="1:1" id="GCe-Ud-F7E"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="fNu-km-jyX">
-                        <rect key="frame" x="55" y="11" width="304" height="42"/>
+                        <rect key="frame" x="55" y="11" width="304" height="39.5"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Subject" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ow4-CR-HAI" userLabel="Subject Label">
-                                <rect key="frame" x="0.0" y="0.0" width="304" height="19.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Subject" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ow4-CR-HAI" userLabel="Subject Label">
+                                <rect key="frame" x="0.0" y="0.0" width="304" height="20.5"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="Snippet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JQs-0C-rb6" userLabel="Snippet Label">
-                                <rect key="frame" x="0.0" y="22.5" width="304" height="19.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="Snippet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JQs-0C-rb6" userLabel="Snippet Label">
+                                <rect key="frame" x="0.0" y="23.5" width="304" height="16"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>

WooCommerce/Classes/ViewRelated/Notifications/NotificationsViewController.swift

@@ -123,15 +123,15 @@ private extension NotificationsViewController {
     /// Setup: NavigationBar Buttons
     ///
     func configureNavigationBarButtons() {
-        let rightBarButton = UIBarButtonItem(image: Gridicon.iconOfType(.menus),
+        let leftBarButton = UIBarButtonItem(image: Gridicon.iconOfType(.checkmark),
                                              style: .plain,
                                              target: self,
                                              action: #selector(markAllAsRead))
-        rightBarButton.tintColor = .white
-        rightBarButton.accessibilityTraits = .button
-        rightBarButton.accessibilityLabel = NSLocalizedString("Mark All as Read", comment: "Accessibility label for the Mark All Notifications as Read Button")
-        rightBarButton.accessibilityHint = NSLocalizedString("Marks Every Notification as Read", comment: "VoiceOver accessibility hint for the Mark All Notifications as Read Action")
-        navigationItem.rightBarButtonItem = rightBarButton
+        leftBarButton.tintColor = .white
+        leftBarButton.accessibilityTraits = .button
+        leftBarButton.accessibilityLabel = NSLocalizedString("Mark All as Read", comment: "Accessibility label for the Mark All Notifications as Read Button")
+        leftBarButton.accessibilityHint = NSLocalizedString("Marks Every Notification as Read", comment: "VoiceOver accessibility hint for the Mark All Notifications as Read Action")
+        navigationItem.leftBarButtonItem = leftBarButton
     }
 
     /// Setup: TableView
@@ -262,8 +262,37 @@ extension NotificationsViewController: UITableViewDelegate {
         tableView.deselectRow(at: indexPath, animated: true)
 
         let note = resultsController.object(at: indexPath)
-        let detailsViewController = NotificationDetailsViewController(note: note)
 
+        switch note.kind {
+        case .storeOrder:
+            presentOrderDetails(for: note)
+        default:
+            presentNotificationDetails(for: note)
+        }
+    }
+}
+
+
+// MARK: - Details Rendering
+//
+private extension NotificationsViewController {
+
+    /// Pushes the Order Details associated to a given Note (if possible).
+    ///
+    func presentOrderDetails(for note: Note) {
+        guard let orderID = note.meta.identifier(forKey: .order), let siteID = note.meta.identifier(forKey: .site) else {
+            DDLogError("## Notification with [\(note.noteId)] lacks its OrderID!")
+            return
+        }
+
+        let loaderViewController = OrderLoaderViewController(orderID: orderID, siteID: siteID)
+        navigationController?.pushViewController(loaderViewController, animated: true)
+    }
+
+    /// Pushes the Notification Details associated to a given Note.
+    ///
+    func presentNotificationDetails(for note: Note) {
+        let detailsViewController = NotificationDetailsViewController(note: note)
         navigationController?.pushViewController(detailsViewController, animated: true)
     }
 }

WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift

@@ -6,6 +6,8 @@ import Yosemite
 import CocoaLumberjack
 
 
+// MARK: - OrderDetailsViewController: Displays the details for a given Order.
+//
 class OrderDetailsViewController: UIViewController {
 
     /// Main TableView.