diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
index 9018e3c..31fe0ca 100644
Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 9ecd442..1bf703a 100644
--- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,11 +10,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ServiceNotificationManager.swift"
- timestampString = "494388533.467001"
+ timestampString = "494778762.798972"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "70"
- endingLineNumber = "70"
+ startingLineNumber = "79"
+ endingLineNumber = "79"
landmarkName = "pollServices()"
landmarkType = "5">
@@ -26,59 +26,27 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ServiceNotificationManager.swift"
- timestampString = "494388607.180284"
+ timestampString = "494778870.382513"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "71"
- endingLineNumber = "71"
+ startingLineNumber = "75"
+ endingLineNumber = "75"
landmarkName = "pollServices()"
landmarkType = "5">
-
-
-
-
-
-
@@ -89,58 +57,12 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "Vendoo/EbayWebServiceManager.swift"
- timestampString = "494685275.012942"
+ filePath = "Vendoo/HomeViewController.swift"
+ timestampString = "494906385.49118"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "573"
- endingLineNumber = "573">
-
-
-
-
-
-
-
-
-
-
-
-
+ startingLineNumber = "183"
+ endingLineNumber = "183">
@@ -166,12 +88,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/CategoriesTableViewController.swift"
- timestampString = "494631326.508326"
+ timestampString = "494897839.603291"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "695"
- endingLineNumber = "695"
- landmarkName = "tableView(_:didSelectRowAtIndexPath:)"
+ startingLineNumber = "579"
+ endingLineNumber = "579"
+ landmarkName = "navigateCategories()"
landmarkType = "5">
@@ -181,94 +103,14 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "494635088.267954"
+ filePath = "Vendoo/CategoryPopUpController.swift"
+ timestampString = "494896911.735111"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "788"
- endingLineNumber = "788"
- landmarkName = "toggleAuth(_:)"
+ startingLineNumber = "41"
+ endingLineNumber = "41"
+ landmarkName = "loadCategories(_:selectedCatCompletion:)"
landmarkType = "5">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -293,60 +151,12 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "494636097.069833"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "764"
- endingLineNumber = "764"
- landmarkName = "webViewDidFinishLoad(_:)"
- landmarkType = "5">
-
-
-
-
-
-
-
-
-
-
-
-
@@ -357,13 +167,237 @@
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
- filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "494637280.732776"
+ filePath = "Vendoo/EbayWebServiceManager.swift"
+ timestampString = "494898365.099933"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "765"
- endingLineNumber = "765"
- landmarkName = "webViewDidFinishLoad(_:)"
+ startingLineNumber = "500"
+ endingLineNumber = "500"
+ landmarkName = "parser(_:foundCharacters:)"
+ landmarkType = "5">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Vendoo/HomeViewController.swift b/Vendoo/HomeViewController.swift
index 05d5b51..bc96801 100644
--- a/Vendoo/HomeViewController.swift
+++ b/Vendoo/HomeViewController.swift
@@ -86,6 +86,7 @@ class HomeViewController: UITabBarController {
self.userListings.append(
Listing(itemTitle: (listingInfo!["listingTitle"] as? String)!,
itemCategory: listingInfo!["listingCategory"] as? String,
+ itemQuantity: (listingInfo!["listingQuantity"] as? String)!,
itemPrice: listingInfo!["listingPrice"] as? String,
itemDescription: listingInfo!["listingDescription"] as? String,
itemImages: listingImages,
diff --git a/Vendoo/ItemImagePickerViewController.swift b/Vendoo/ItemImagePickerViewController.swift
index 7a0f36e..168d1b5 100644
--- a/Vendoo/ItemImagePickerViewController.swift
+++ b/Vendoo/ItemImagePickerViewController.swift
@@ -443,6 +443,7 @@ extension ItemImagePickerViewController {
"listingPrice": self.itemPrice.text,
"listingCategory": category,
"listingDescription": self.itemDescription.text,
+ "listingQuantity": self.itemQuantity.text!,
"numberOfSupportingImages" : counter,
"isListingDraft": true,
"networks": ["areNetworksChosen": false]]
diff --git a/Vendoo/ItemTableViewController.swift b/Vendoo/ItemTableViewController.swift
index 1689642..0ce3949 100644
--- a/Vendoo/ItemTableViewController.swift
+++ b/Vendoo/ItemTableViewController.swift
@@ -21,6 +21,7 @@ class ItemTableViewController: UIViewController {
@IBOutlet weak var menuButton: UIBarButtonItem!
var loadingView: UIView!
+ var selectedListing: Listing!
override func viewDidLoad() {
super.viewDidLoad()
@@ -87,6 +88,35 @@ extension ItemTableViewController {
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
// Get the new view controller using segue.destinationViewController.
// Pass the selected object to the new view controller.
+
+ let des = segue.destinationViewController as! ListingPreviewViewController
+ var tempImages: [UIImageView] = []
+ for uiImage in self.selectedListing.images {
+ tempImages.append(UIImageView(image: uiImage))
+ }
+ let dict:[String:AnyObject] = [
+ "pictures": tempImages,
+ "title": self.selectedListing.title,
+ "description": self.selectedListing.desc,
+ "price": self.selectedListing.price,
+ "category": self.selectedListing.category,
+ "quantity": self.selectedListing.quantity
+ ]
+
+ des.setDictionary(self.selectedListing.networks, itemdictionary: dict)
+ des.setManagers(
+ ((self.tabBarController as? HomeViewController)?.fbGraphManager)!,
+ fireManager: ((self.tabBarController as? HomeViewController)?.firebaseManager)!,
+ ebayManager: ((self.tabBarController as? HomeViewController)?.ebayGraphManager)!,
+ etsyManager: ((self.tabBarController as? HomeViewController)?.etsyManager)!
+ )
+
+ if self.selectedListing.isDraft! {
+ des.setViewState("Editible")
+ }else {
+ des.setViewState("NonEditable")
+ }
+
}
}
@@ -153,6 +183,11 @@ extension ItemTableViewController: UITableViewDataSource{
}
return cell
}
+
+ func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+ self.selectedListing = (self.tabBarController as? HomeViewController)?.userListings[indexPath.row]
+ self.performSegueWithIdentifier("ItemDetailSegue", sender: self)
+ }
}
diff --git a/Vendoo/Listing.swift b/Vendoo/Listing.swift
index a86601b..a0373b0 100644
--- a/Vendoo/Listing.swift
+++ b/Vendoo/Listing.swift
@@ -15,17 +15,19 @@ class Listing : NSObject {
var category: String!
var price: String!
var desc: String!
+ var quantity: String!
var isDraft: Bool!
var images: [UIImage]!
var key: String!
var networks: Dictionary!
- init(itemTitle:String, itemCategory: String!, itemPrice: String!, itemDescription: String!, itemImages: [UIImage], isDraftListing: Bool, itemKey: String, networksSellingOn: Dictionary){
+ init(itemTitle:String, itemCategory: String!, itemQuantity: String!, itemPrice: String!, itemDescription: String!, itemImages: [UIImage], isDraftListing: Bool, itemKey: String, networksSellingOn: Dictionary){
self.title = itemTitle
self.category = itemCategory
self.price = itemPrice
self.desc = itemDescription
+ self.quantity = itemQuantity
self.isDraft = isDraftListing
self.images = itemImages
self.key = itemKey
diff --git a/Vendoo/ListingPreviewViewController.swift b/Vendoo/ListingPreviewViewController.swift
index 3d26171..2e576d1 100644
--- a/Vendoo/ListingPreviewViewController.swift
+++ b/Vendoo/ListingPreviewViewController.swift
@@ -28,6 +28,9 @@ class ListingPreviewViewController: UIViewController {
@IBOutlet weak var itemPrice: UITextView!
@IBOutlet weak var itemCategory: UITextView!
@IBOutlet weak var networks: UICollectionView!
+ @IBOutlet weak var publishBtn: UIButton!
+ @IBOutlet weak var edit_button: UIButton!
+ @IBOutlet weak var cancel_backBtn: UIButton!
//class variables
private var networksDictionary: Dictionary = Dictionary()
@@ -40,10 +43,25 @@ class ListingPreviewViewController: UIViewController {
private var lastListingKey: String!
private var newInProgressListing: Dictionary = Dictionary()
var loadingView: UIView!
+ private var itemViewState = ""
override func viewDidLoad() {
super.viewDidLoad()
+ if (self.itemViewState == "NonEditable") {
+ dispatch_async(dispatch_get_main_queue(), {
+ //self.cancel_backBtn.titleLabel?.text = "Back"
+ self.edit_button.hidden = true
+ self.edit_button.enabled = false
+
+ self.publishBtn.hidden = true
+ self.publishBtn.enabled = false
+ })
+ }
+ /*else if (self.itemViewState == "Editable") {
+ //self.cancel_backBtn.titleLabel?.text = "Back"
+
+ }*/
// Do any additional setup after loading the view.
// Initialization code
@@ -73,6 +91,10 @@ class ListingPreviewViewController: UIViewController {
self.itemQuantity.text = self.itemListingDictionary["quantity"] as! String
}
+ func setViewState(state: String) {
+ self.itemViewState = state
+ }
+
func setDictionary(netdictionary:Dictionary, itemdictionary: Dictionary){
self.networksDictionary = netdictionary
self.itemListingDictionary = itemdictionary
@@ -142,9 +164,15 @@ extension Dictionary {
//MARK: - IBActions
extension ListingPreviewViewController {
@IBAction func cancel(sender: AnyObject) {
- let storyboard: UIStoryboard = UIStoryboard(name: "Main", bundle: nil)
- let vc = storyboard.instantiateViewControllerWithIdentifier("Reveal View Controller") as! SWRevealViewController
- self.presentViewController(vc, animated: true, completion: nil)
+ if self.itemViewState == "" {
+ let storyboard: UIStoryboard = UIStoryboard(name: "Main", bundle: nil)
+ let vc = storyboard.instantiateViewControllerWithIdentifier("Reveal View Controller") as! SWRevealViewController
+ self.presentViewController(vc, animated: true, completion: nil)
+ }
+ else if self.itemViewState == "Editable" || self.itemViewState == "NonEditable"{
+ self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil)
+ }
+
}
@IBAction func publishItem(sender: AnyObject) {
@@ -395,6 +423,7 @@ extension ListingPreviewViewController {
"listingTitle": self.itemTitle.text,
"listingPrice": self.itemPrice.text,
"listingCategory": self.itemCategory.text,
+ "listingQuantity": self.itemQuantity.text,
"listingDescription": self.itemDescription.text,
"numberOfSupportingImages" : ((self.itemListingDictionary["pictures"] as? [UIImageView])?.count)! - 1,
"isListingDraft": false,
diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard
index de3c82e..05cecbe 100755
--- a/Vendoo/Main.storyboard
+++ b/Vendoo/Main.storyboard
@@ -1006,7 +1006,7 @@
-
+