Merge pull request #130 from commercetools/issues/#51-categories

Closes #51 Add categories

Podfile

@@ -2,7 +2,7 @@ platform :ios, '10.0'
 use_frameworks!
 
 def common_pods
-  pod 'Commercetools'
+  pod 'Commercetools', :git => 'http://github.com/commercetools/commercetools-ios-sdk.git', :branch => 'master'
   pod 'ReactiveCocoa'
   pod 'ReactiveObjC'
   pod 'DZNEmptyDataSet'
@@ -23,7 +23,7 @@ end
 
 target 'Sunrise Watch Extension' do
   platform :watchos, '3.0'
-  pod 'Commercetools'
+  pod 'Commercetools', :git => 'http://github.com/commercetools/commercetools-ios-sdk.git', :branch => 'master'
   pod 'ReactiveSwift'
   pod 'SDWebImage', '4.0.0-beta2'
   pod 'NKWatchActivityIndicator'

ReservationNotification/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>
-	<string>60</string>
+	<string>61</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

Sunrise Watch Extension/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>
-	<string>60</string>
+	<string>61</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

Sunrise Watch/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>
-	<string>60</string>
+	<string>61</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Sunrise/Assets.xcassets/Categories/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sunrise/Assets.xcassets/Categories/category-separator.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "category-separator.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sunrise/Assets.xcassets/Categories/category_accessories.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "category_accessories.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sunrise/Assets.xcassets/Categories/category_men.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "category_men.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sunrise/Assets.xcassets/Categories/category_women.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "category_women.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sunrise/Cells/CategoryCell.swift

@@ -0,0 +1,10 @@
+//
+// Copyright (c) 2016 Commercetools. All rights reserved.
+//
+
+import UIKit
+
+class CategoryCell: UITableViewCell {
+
+    @IBOutlet weak var categoryName: UILabel!
+}

Sunrise/Helpers/AppRouting.swift

@@ -10,6 +10,7 @@ class AppRouting {
     enum TabIndex: Int {
         case homeTab = 0
         case searchTab
+        case categoriesTab
         case myAccountTab
         case cartTab
 
@@ -37,6 +38,13 @@ class AppRouting {
         return (tabBarController?.viewControllers?[TabIndex.homeTab.index] as? UINavigationController)?.viewControllers.first as? ProductOverviewViewController
     }
 
+    static var categoryProductOverviewViewController: ProductOverviewViewController? {
+        if let categoriesNavigationController = tabBarController?.viewControllers?[TabIndex.categoriesTab.index] as? UINavigationController {
+            return categoriesNavigationController.viewControllers.count > 1 ? categoriesNavigationController.viewControllers[1] as? ProductOverviewViewController : nil
+        }
+        return nil
+    }
+
     /**
         In case the user is not logged in, this method presents login view controller from my account tab.
     */
@@ -136,6 +144,15 @@ class AppRouting {
         homeNavigationController.popToRootViewController(animated: false)
     }
 
+    /**
+        Pops category navigation controller to it's root view controller.
+    */
+    static func popCategoryToRoot() {
+        guard let tabBarController = tabBarController, let categoryNavigationController = tabBarController.viewControllers?[TabIndex.categoriesTab.index] as? UINavigationController else { return }
+
+        categoryNavigationController.popToRootViewController(animated: false)
+    }
+
     /**
         Switches back to the my account tab, and navigates to the my store view controller.
     */
@@ -157,8 +174,10 @@ class AppRouting {
         guard let tabBarController = tabBarController, let accountNavigationController = tabBarController.viewControllers?[TabIndex.myAccountTab.index] as? UINavigationController,
                 let accountViewController = accountNavigationController.viewControllers.first as? AccountViewController else { return }
 
-        tabBarController.selectedIndex = TabIndex.myAccountTab.index
         accountNavigationController.popToRootViewController(animated: false)
-        accountViewController.viewModel?.presentConfirmationForReservationWithId(reservationId)
+        tabBarController.selectedIndex = TabIndex.myAccountTab.index
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            accountViewController.viewModel?.presentConfirmationForReservationWithId(reservationId)
+        }
     }
 }

Sunrise/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>60</string>
+	<string>61</string>
 	<key>Displayable attributes</key>
 	<array>
 		<string>colorFreeDefinition</string>

Sunrise/Models/Attribute.swift

@@ -38,21 +38,21 @@ extension Attribute {
         case ("money", let rawValue):
             return Mapper<Money>().map(JSONObject: rawValue)?.description
         case ("date", let rawValue):
-            if let date = ISO8601DateTransform().transformFromJSON(rawValue) {
+            if let date = Commercetools.ISO8601DateTransform().transformFromJSON(rawValue) {
                 dateFormatter.dateStyle = .medium
                 dateFormatter.timeStyle = .none
                 return dateFormatter.string(from: date)
             }
             return nil
         case ("time", let rawValue):
-            if let date = ISO8601DateTransform().transformFromJSON(rawValue) {
+            if let date = Commercetools.ISO8601DateTransform().transformFromJSON(rawValue) {
                 dateFormatter.dateStyle = .none
                 dateFormatter.timeStyle = .short
                 return dateFormatter.string(from: date)
             }
             return nil
         case ("datetime", let rawValue):
-            if let date = ISO8601DateTransform().transformFromJSON(rawValue) {
+            if let date = Commercetools.ISO8601DateTransform().transformFromJSON(rawValue) {
                 dateFormatter.dateStyle = .medium
                 dateFormatter.timeStyle = .short
                 return dateFormatter.string(from: date)