diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index dd7dd24..223a6da 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 203f601..ba03ca1 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 = "502090796.554329" + timestampString = "502117661.785173" 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 = "502090796.554446" + timestampString = "502117661.785283" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "572" @@ -584,11 +584,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502090690.855182" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "223" - endingLineNumber = "223" + startingLineNumber = "224" + endingLineNumber = "224" landmarkName = "tableView(_:cellForRowAtIndexPath:)" landmarkType = "5"> @@ -600,11 +600,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502090690.855182" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "231" - endingLineNumber = "231" + startingLineNumber = "232" + endingLineNumber = "232" landmarkName = "tableView(_:cellForRowAtIndexPath:)" landmarkType = "5"> @@ -616,11 +616,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502090690.855182" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "236" - endingLineNumber = "236" + startingLineNumber = "237" + endingLineNumber = "237" landmarkName = "tableView(_:cellForRowAtIndexPath:)" landmarkType = "5"> @@ -632,11 +632,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502090690.855182" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "257" - endingLineNumber = "257" + startingLineNumber = "258" + endingLineNumber = "258" landmarkName = "tableView(_:cellForRowAtIndexPath:)" landmarkType = "5"> @@ -648,11 +648,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502090690.855182" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "292" - endingLineNumber = "292" + startingLineNumber = "293" + endingLineNumber = "293" landmarkName = "tableView(_:cellForRowAtIndexPath:)" landmarkType = "5"> @@ -744,7 +744,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift" - timestampString = "502090796.57836" + timestampString = "502117661.803299" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "194" @@ -759,7 +759,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift" - timestampString = "502090796.578473" + timestampString = "502117661.803407" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "197" @@ -888,7 +888,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/HomeViewController.swift" - timestampString = "502090796.581482" + timestampString = "502117661.806909" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "16" @@ -903,7 +903,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/HomeViewController.swift" - timestampString = "502090796.581599" + timestampString = "502117661.80707" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "16" @@ -918,7 +918,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/HomeViewController.swift" - timestampString = "502090796.581697" + timestampString = "502117661.807169" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "16" @@ -1111,15 +1111,159 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502088130.598283" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "94" - endingLineNumber = "94" + startingLineNumber = "95" + endingLineNumber = "95" landmarkName = "revealController(_:didMoveToPosition:)" landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1143,12 +1287,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502090835.401726" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "103" - endingLineNumber = "103" - landmarkName = "revealController(_:didMoveToPosition:)" + startingLineNumber = "120" + endingLineNumber = "120" + landmarkName = "revealController(_:willMoveToPosition:)" landmarkType = "5"> @@ -1159,12 +1303,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemTableViewController.swift" - timestampString = "502090836.847936" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "106" - endingLineNumber = "106" - landmarkName = "revealController(_:didMoveToPosition:)" + startingLineNumber = "114" + endingLineNumber = "114" + landmarkName = "revealController(_:willMoveToPosition:)" landmarkType = "5"> @@ -1175,12 +1319,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/NetworksTableViewController.swift" - timestampString = "502090910.38905" + timestampString = "502118113.759358" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "128" - endingLineNumber = "128" - landmarkName = "revealController(_:didMoveToPosition:)" + startingLineNumber = "153" + endingLineNumber = "153" + landmarkName = "revealController(_:willMoveToPosition:)" landmarkType = "5"> @@ -1191,23 +1335,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/NetworksTableViewController.swift" - timestampString = "502090913.283118" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "133" - endingLineNumber = "133" - landmarkName = "revealController(_:didMoveToPosition:)" - landmarkType = "5"> - - - - - - - - - - - - diff --git a/Vendoo/ItemTableViewController.swift b/Vendoo/ItemTableViewController.swift index cb9a379..192efa7 100644 --- a/Vendoo/ItemTableViewController.swift +++ b/Vendoo/ItemTableViewController.swift @@ -61,6 +61,7 @@ class ItemTableViewController: UIViewController { override func viewWillAppear(animated: Bool) { super.viewWillAppear(animated) + (menuButton.target as! SWRevealViewController).delegate = self self.tabBarController?.tabBar.hidden = false } override func didReceiveMemoryWarning() { diff --git a/Vendoo/NetworksTableViewController.swift b/Vendoo/NetworksTableViewController.swift index 30aed20..d80a6c5 100644 --- a/Vendoo/NetworksTableViewController.swift +++ b/Vendoo/NetworksTableViewController.swift @@ -58,13 +58,16 @@ class NetworksTableViewController: UIViewController { if self.revealViewController() != nil { menuButton.target = self.revealViewController() - (menuButton.target as! SWRevealViewController).delegate = self menuButton.action = "revealToggle:" self.view.addGestureRecognizer(self.revealViewController().panGestureRecognizer()) } } + override func viewDidAppear(animated: Bool) { + (menuButton.target as! SWRevealViewController).delegate = self + } + override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated.