diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
index 223a6da..2e5e7bb 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 ba03ca1..5371c7f 100644
--- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -186,7 +186,7 @@
moduleName = "Vendoo"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift"
- timestampString = "502117661.785173"
+ timestampString = "502121193.541596"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "570"
@@ -201,7 +201,7 @@
moduleName = "Vendoo"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift"
- timestampString = "502117661.785283"
+ timestampString = "502121193.54177"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "572"
@@ -653,8 +653,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "293"
endingLineNumber = "293"
- landmarkName = "tableView(_:cellForRowAtIndexPath:)"
- landmarkType = "5">
+ landmarkName = "ItemTableViewController"
+ landmarkType = "3">
@@ -1132,7 +1132,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "98"
endingLineNumber = "98"
- landmarkName = "revealController(_:didMoveToPosition:)"
+ landmarkName = "prepareForSegue(_:sender:)"
landmarkType = "5">
@@ -1148,7 +1148,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "104"
endingLineNumber = "104"
- landmarkName = "revealController(_:didMoveToPosition:)"
+ landmarkName = "prepareForSegue(_:sender:)"
landmarkType = "5">
@@ -1164,6 +1164,22 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "107"
endingLineNumber = "107"
+ landmarkName = "prepareForSegue(_:sender:)"
+ landmarkType = "5">
+
+
+
+
@@ -1175,11 +1191,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "502118113.759358"
+ timestampString = "502120433.435342"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "131"
- endingLineNumber = "131"
+ startingLineNumber = "138"
+ endingLineNumber = "138"
landmarkName = "revealController(_:didMoveToPosition:)"
landmarkType = "5">
@@ -1191,11 +1207,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "502118113.759358"
+ timestampString = "502120433.435342"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "136"
- endingLineNumber = "136"
+ startingLineNumber = "142"
+ endingLineNumber = "142"
landmarkName = "revealController(_:didMoveToPosition:)"
landmarkType = "5">
@@ -1207,27 +1223,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "502118113.759358"
+ timestampString = "502120433.435342"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "140"
- endingLineNumber = "140"
- landmarkName = "revealController(_:didMoveToPosition:)"
- landmarkType = "5">
-
-
-
-
@@ -1239,11 +1239,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "502118113.759358"
+ timestampString = "502120433.435342"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "152"
- endingLineNumber = "152"
+ startingLineNumber = "154"
+ endingLineNumber = "154"
landmarkName = "revealController(_:willMoveToPosition:)"
landmarkType = "5">
@@ -1255,11 +1255,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "502118113.759358"
+ timestampString = "502120433.435342"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "157"
- endingLineNumber = "157"
+ startingLineNumber = "159"
+ endingLineNumber = "159"
landmarkName = "revealController(_:willMoveToPosition:)"
landmarkType = "5">
@@ -1276,7 +1276,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "119"
endingLineNumber = "119"
- landmarkName = "revealController(_:willMoveToPosition:)"
+ landmarkName = "prepareForSegue(_:sender:)"
landmarkType = "5">
@@ -1292,7 +1292,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "120"
endingLineNumber = "120"
- landmarkName = "revealController(_:willMoveToPosition:)"
+ landmarkName = "prepareForSegue(_:sender:)"
landmarkType = "5">
@@ -1308,6 +1308,22 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "114"
endingLineNumber = "114"
+ landmarkName = "prepareForSegue(_:sender:)"
+ landmarkType = "5">
+
+
+
+
@@ -1319,27 +1335,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "502118113.759358"
+ timestampString = "502120433.435342"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "153"
- endingLineNumber = "153"
- landmarkName = "revealController(_:willMoveToPosition:)"
- landmarkType = "5">
-
-
-
-
@@ -1351,14 +1351,30 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/NetworksTableViewController.swift"
- timestampString = "502118113.759358"
+ timestampString = "502120433.435342"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "133"
- endingLineNumber = "133"
+ startingLineNumber = "135"
+ endingLineNumber = "135"
landmarkName = "revealController(_:didMoveToPosition:)"
landmarkType = "5">
+
+
+
+
diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard
index 226e310..f1a7966 100755
--- a/Vendoo/Main.storyboard
+++ b/Vendoo/Main.storyboard
@@ -687,7 +687,7 @@
-
+
@@ -2414,9 +2417,9 @@
-
+
diff --git a/Vendoo/NetworksTableViewController.swift b/Vendoo/NetworksTableViewController.swift
index d80a6c5..bff9965 100644
--- a/Vendoo/NetworksTableViewController.swift
+++ b/Vendoo/NetworksTableViewController.swift
@@ -65,7 +65,9 @@ class NetworksTableViewController: UIViewController {
}
override func viewDidAppear(animated: Bool) {
- (menuButton.target as! SWRevealViewController).delegate = self
+ if (!self.networkToggleOrSelect) {
+ (menuButton.target as! SWRevealViewController).delegate = self
+ }
}
override func didReceiveMemoryWarning() {
@@ -362,6 +364,10 @@ extension NetworksTableViewController {
self.performSegueWithIdentifier("ItemPreviewSegue", sender: self)
}
+ @IBAction func cancelListing(sender: AnyObject) {
+ self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil)
+ }
+
@IBAction func draftItem(sender: AnyObject) {
if((self.itemListingDictionary["pictures"]! as? [UIImageView])?[0].image == nil){
@@ -375,7 +381,8 @@ extension NetworksTableViewController {
//save listing to private user path in firebase
let newListingRef = self.firManager.ref.child("Users").child("\(self.firManager.user_email)").child("user_Listings").childByAutoId()
- self.networksDictionary["areNetworksChosen"] = true
+ self.networkCount > 0 ? (self.networksDictionary["areNetworksChosen"] = true) : (self.networksDictionary["areNetworksChosen"] = false)
+
let listing = ["listingID": newListingRef.key,
"seller email": (NSUserDefaults.standardUserDefaults().objectForKey("email") as? String)!,
"listingTitle": self.itemListingDictionary["title"],