diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index c9a1b27..91a749e 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 4c822ea..1b8b54d 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -19,38 +19,6 @@ landmarkType = "5"> - - - - - - - - @@ -90,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "494033422.080596" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "608" - endingLineNumber = "608" + startingLineNumber = "619" + endingLineNumber = "619" landmarkName = "collectionView(_:cellForItemAtIndexPath:)" landmarkType = "5"> @@ -106,11 +74,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493930954.132313" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "579" - endingLineNumber = "579" + startingLineNumber = "590" + endingLineNumber = "590" landmarkName = "ListingPreviewViewController" landmarkType = "3"> @@ -122,11 +90,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "494033422.080596" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "700" - endingLineNumber = "700"> + startingLineNumber = "711" + endingLineNumber = "711"> @@ -152,11 +120,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "494033422.080596" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "678" - endingLineNumber = "678"> + startingLineNumber = "689" + endingLineNumber = "689"> @@ -214,11 +182,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493923752.375488" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "459" - endingLineNumber = "459" + startingLineNumber = "470" + endingLineNumber = "470" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -230,11 +198,11 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift" - timestampString = "494211344.051886" + timestampString = "494251851.787444" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "460" - endingLineNumber = "460" + startingLineNumber = "471" + endingLineNumber = "471" offsetFromSymbolStart = "119876"> @@ -262,11 +230,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493924171.32457" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "477" - endingLineNumber = "477" + startingLineNumber = "488" + endingLineNumber = "488" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -278,11 +246,11 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift" - timestampString = "494211344.059888" + timestampString = "494251851.788693" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "479" - endingLineNumber = "479" + startingLineNumber = "490" + endingLineNumber = "490" offsetFromSymbolStart = "4771"> @@ -310,11 +278,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493924171.32457" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "487" - endingLineNumber = "487" + startingLineNumber = "498" + endingLineNumber = "498" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -326,11 +294,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493930954.132313" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "497" - endingLineNumber = "497" + startingLineNumber = "508" + endingLineNumber = "508" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -342,11 +310,11 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift" - timestampString = "494211344.069134" + timestampString = "494251851.790195" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "498" - endingLineNumber = "498" + startingLineNumber = "509" + endingLineNumber = "509" offsetFromSymbolStart = "1030"> @@ -389,11 +357,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493930954.132313" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "507" - endingLineNumber = "507" + startingLineNumber = "518" + endingLineNumber = "518" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -405,11 +373,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493930954.132313" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "568" - endingLineNumber = "568" + startingLineNumber = "579" + endingLineNumber = "579" landmarkName = "ListingPreviewViewController" landmarkType = "3"> @@ -421,11 +389,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "493953484.620568" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "561" - endingLineNumber = "561" + startingLineNumber = "572" + endingLineNumber = "572" landmarkName = "ListingPreviewViewController" landmarkType = "3"> @@ -499,11 +467,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "494033422.080596" + timestampString = "494250212.935347" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "654" - endingLineNumber = "654"> + startingLineNumber = "665" + endingLineNumber = "665"> + startingLineNumber = "698" + endingLineNumber = "698"> + startingLineNumber = "674" + endingLineNumber = "674"> + + + + + + + + + + + + diff --git a/Vendoo/EtsyRESTAPIManager.swift b/Vendoo/EtsyRESTAPIManager.swift index d24a554..b464c31 100644 --- a/Vendoo/EtsyRESTAPIManager.swift +++ b/Vendoo/EtsyRESTAPIManager.swift @@ -52,8 +52,6 @@ class EtsyRESTAPIManager: NSObject { "accessTokenUrl": "https://openapi.etsy.com/v2/oauth/access_token?", "responseType": "token"]) - - //FIXME: something is wrong when here when logging back in with a diff user if(self.isAuthorized){ let dictionary = Locksmith.loadDataForUserAccount(self.userEmail, inService: "vendoo_oauth_etsy") let oauthDictionary = dictionary?["etsy_oauth"] as? Dictionary diff --git a/Vendoo/ItemImagePickerViewController.swift b/Vendoo/ItemImagePickerViewController.swift index 64d2ec7..7a0f36e 100644 --- a/Vendoo/ItemImagePickerViewController.swift +++ b/Vendoo/ItemImagePickerViewController.swift @@ -37,6 +37,8 @@ class ItemImagePickerViewController: UIViewController { private var currImageSelected: UIImageView! private var currUILabel: UILabel! private var imageIndex: Int! + private var isEditing: Bool = false + private var currentInformation: Dictionary! override func viewDidLoad() { super.viewDidLoad() @@ -52,19 +54,49 @@ class ItemImagePickerViewController: UIViewController { self.itemPrice.delegate = self self.picker.delegate = self - // Input data into the Array: - pickerData = ["Category 1", "Category 2", "Category 3", "Category 4", "Category 5", "Category 6"] - let tapGestureMain = UITapGestureRecognizer(target: self, action: #selector(ItemImagePickerViewController.takePicture)) - let tapGesture2 = UITapGestureRecognizer(target: self, action: #selector(ItemImagePickerViewController.takePicture)) - //tapGesture.cancelsTouchesInView = true self.view.addGestureRecognizer(tapGestureMain) - //self.possibleItemImageMain.addGestureRecognizer(tapGestureMain) - //self.possibleItemImage2.addGestureRecognizer(tapGesture2) - //self.possibleItemImage3.addGestureRecognizer(tapGesture) - //self.possibleItemImage4.addGestureRecognizer(tapGesture) - //self.possibleItemImage5.addGestureRecognizer(tapGesture) - + + if(self.isEditing) { + self.itemName.text = self.currentInformation["title"] as? String + self.itemDescription.text = self.currentInformation["description"] as? String + self.itemQuantity.text = self.currentInformation["quantity"] as? String + self.itemPrice.text = self.currentInformation["price"] as? String + + //@FIXME: Cancel button not changing to Back button label + dispatch_async(dispatch_get_main_queue(), { + self.cancelButton.titleLabel?.text = "Back" + }) + + var images = (self.currentInformation["images"] as? [UIImage])! + for i in 0...(images.count - 1) { + switch i { + case 0: + self.possibleItemImageMain.image = images[i] + self.itemImagesSelections[i] = true + break + case 1: + self.possibleItemImage2.image = images[i] + self.itemImagesSelections[i] = true + break + case 2: + self.possibleItemImage3.image = images[i] + self.itemImagesSelections[i] = true + break + case 3: + self.possibleItemImage4.image = images[i] + self.itemImagesSelections[i] = true + break + case 4: + self.possibleItemImage5.image = images[i] + self.itemImagesSelections[i] = true + break + default: + break + } + } + + } } @@ -79,7 +111,12 @@ class ItemImagePickerViewController: UIViewController { self.tabBarController?.tabBar.hidden = true } - + func toggleEditingMode(dictionary: Dictionary?){ + if(!self.isEditing) { + self.currentInformation = dictionary! + } + self.isEditing = !self.isEditing + } } @@ -126,12 +163,15 @@ extension ItemImagePickerViewController { dict["pictures"] = images (segue.destinationViewController as! CategoriesTableViewController).setListingDictionary(dict) - (segue.destinationViewController as! CategoriesTableViewController).setManagers(((self.tabBarController as? HomeViewController)?.fbGraphManager)!, - fireManager: ((self.tabBarController as? HomeViewController)?.firebaseManager)!, ebayManager: ((self.tabBarController as? HomeViewController)?.ebayGraphManager)!, - etsyManager: ((self.tabBarController as? HomeViewController)?.etsyManager)!) - //(segue.destinationViewController as! NetworksTableViewController).setNetworkSelectFunctionality(true) - //print(self.categoryPicker.selectedRowInComponent(0)) + if(self.isEditing) { + (segue.destinationViewController as! CategoriesTableViewController).setManagers((self.currentInformation["fbManager"] as? FacebookGraphAPIManager)!, fireManager: (self.currentInformation["firebaseManager"] as? FirebaseManager)!, ebayManager: (self.currentInformation["ebayManager"] as? EbayWebServiceManager)!, etsyManager: (self.currentInformation["etsyManager"] as? EtsyRESTAPIManager)!) + + }else { + (segue.destinationViewController as! CategoriesTableViewController).setManagers(((self.tabBarController as? HomeViewController)?.fbGraphManager)!, + fireManager: ((self.tabBarController as? HomeViewController)?.firebaseManager)!, ebayManager: ((self.tabBarController as? HomeViewController)?.ebayGraphManager)!, + etsyManager: ((self.tabBarController as? HomeViewController)?.etsyManager)!) + } } @@ -185,7 +225,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi case 2: if(self.itemImagesSelections[0] && self.itemImagesSelections[1]) { - //self.itemImagesSelections[2] = true viewsWereSaved[0] = true self.imageIndex = 2 @@ -201,7 +240,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi case 3: if(self.itemImagesSelections[0] && self.itemImagesSelections[1] && self.itemImagesSelections[2]) { - //self.itemImagesSelections[3] = true viewsWereSaved[0] = true self.imageIndex = 3 @@ -217,7 +255,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi case 4: if(self.itemImagesSelections[0] && self.itemImagesSelections[1] && self.itemImagesSelections[2] && self.itemImagesSelections[3]) { - //self.itemImagesSelections[4] = true viewsWereSaved[0] = true self.imageIndex = 4 @@ -244,20 +281,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi viewsWereSaved[1] = true } } - /* - for (UIView *view in self.view.subviews) - { - if ([view isKindOfClass:[UIImageView class]] && CGRectContainsPoint(view.frame, location)) - { - UIImageView *image = (UIImageView *) view; - - // ok, now you know which image you received your long press for - // do whatever you wanted on it at this point - - return; - } - } - */ } @@ -492,9 +515,13 @@ extension ItemImagePickerViewController { } @IBAction func cancelNewListing(sender: AnyObject) { - //nil out all data user may have entered so that when they reopen new listing page - //it initialized to a fresh screen. - self.tabBarController?.selectedIndex = 0 + //@FIXME: nil out all data user may have entered so that when they reopen new listing page it initialized to a fresh screen. + + if(!self.isEditing) { + self.tabBarController?.selectedIndex = 0 + }else{ + self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil) + } } diff --git a/Vendoo/ListingPreviewViewController.swift b/Vendoo/ListingPreviewViewController.swift index a402872..d48f393 100644 --- a/Vendoo/ListingPreviewViewController.swift +++ b/Vendoo/ListingPreviewViewController.swift @@ -92,12 +92,23 @@ class ListingPreviewViewController: UIViewController { // Pass the selected object to the new view controller. if(segue.identifier == "EditListingSegue"){ + var imageData: [UIImage] = [] + for imageView in (self.itemListingDictionary["pictures"] as? [UIImageView])! { + imageData.append(imageView.image!) + } + + let dict: Dictionary = ["title": self.itemTitle.text, + "description": self.itemDescription.text, + "price": self.itemPrice.text, + "quantity": self.itemQuantity.text, + "images": imageData, + "category": self.itemCategory.text, + "fbManager": self.graphManager, + "ebayManager": self.ebayManager, + "etsyManager": self.etsyManager, + "firebaseManager": self.firManager] let vc = (segue.destinationViewController as? ItemImagePickerViewController)! - vc.itemName.text? = self.itemTitle.text - vc.itemPrice.text? = self.itemPrice.text - vc.itemDescription.text? = self.itemDescription.text - vc.possibleItemImageMain = self.itemPicture - vc.itemQuantity.text? = self.itemQuantity.text + vc.toggleEditingMode(dict) } } diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard index cab292d..fb5df32 100755 --- a/Vendoo/Main.storyboard +++ b/Vendoo/Main.storyboard @@ -2450,11 +2450,11 @@ - - - - + + + +