diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
index 47c1e16..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 1a55742..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 = "502086315.550032"
+ 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 = "502086315.550156"
+ timestampString = "502117661.785283"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "572"
@@ -584,11 +584,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemTableViewController.swift"
- timestampString = "501291030.615232"
+ timestampString = "502118113.759358"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "185"
- endingLineNumber = "185"
+ startingLineNumber = "224"
+ endingLineNumber = "224"
landmarkName = "tableView(_:cellForRowAtIndexPath:)"
landmarkType = "5">
@@ -600,11 +600,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemTableViewController.swift"
- timestampString = "501291030.615232"
+ timestampString = "502118113.759358"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "193"
- endingLineNumber = "193"
+ startingLineNumber = "232"
+ endingLineNumber = "232"
landmarkName = "tableView(_:cellForRowAtIndexPath:)"
landmarkType = "5">
@@ -616,11 +616,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemTableViewController.swift"
- timestampString = "501291030.615232"
+ timestampString = "502118113.759358"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "198"
- endingLineNumber = "198"
+ startingLineNumber = "237"
+ endingLineNumber = "237"
landmarkName = "tableView(_:cellForRowAtIndexPath:)"
landmarkType = "5">
@@ -632,11 +632,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemTableViewController.swift"
- timestampString = "501291030.615232"
+ timestampString = "502118113.759358"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "219"
- endingLineNumber = "219"
+ startingLineNumber = "258"
+ endingLineNumber = "258"
landmarkName = "tableView(_:cellForRowAtIndexPath:)"
landmarkType = "5">
@@ -648,11 +648,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemTableViewController.swift"
- timestampString = "501291030.615232"
+ timestampString = "502118113.759358"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "254"
- endingLineNumber = "254"
+ startingLineNumber = "293"
+ endingLineNumber = "293"
landmarkName = "tableView(_:cellForRowAtIndexPath:)"
landmarkType = "5">
@@ -664,7 +664,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/MenuPanelViewController.swift"
- timestampString = "501343346.000481"
+ timestampString = "502088149.011671"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "112"
@@ -744,7 +744,7 @@
moduleName = "Vendoo"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift"
- timestampString = "502086315.568123"
+ 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 = "502086315.568237"
+ 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 = "502086315.571188"
+ 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 = "502086315.571287"
+ 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 = "502086315.571382"
+ timestampString = "502117661.807169"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "16"
@@ -988,7 +988,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "315"
endingLineNumber = "315"
- landmarkName = "takePicture(_:)"
+ landmarkName = "accessCam()"
landmarkType = "5">
@@ -1088,5 +1088,277 @@
landmarkType = "5">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Vendoo/ItemTableViewController.swift b/Vendoo/ItemTableViewController.swift
index 7dae7af..192efa7 100644
--- a/Vendoo/ItemTableViewController.swift
+++ b/Vendoo/ItemTableViewController.swift
@@ -11,6 +11,7 @@
*/
import UIKit
import TYMActivityIndicatorView
+import SWRevealViewController
class ItemTableViewController: UIViewController {
@@ -39,6 +40,7 @@ class ItemTableViewController: UIViewController {
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(stopIndicator), name: "finished_fetching_listings", object: nil)
if self.revealViewController() != nil {
menuButton.target = self.revealViewController()
+ (menuButton.target as! SWRevealViewController).delegate = self
menuButton.action = "revealToggle:"
self.view.addGestureRecognizer(self.revealViewController().panGestureRecognizer())
}
@@ -59,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() {
@@ -87,6 +90,42 @@ extension ItemTableViewController {
}
}
+// MARK: - Side Menu View
+extension ItemTableViewController: SWRevealViewControllerDelegate {
+ func revealController(revealController: SWRevealViewController!, didMoveToPosition position: FrontViewPosition) {
+ if(position == FrontViewPosition.Left) {
+ for view in self.view.subviews {
+ view.userInteractionEnabled = true
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = true
+ } else {
+ for view in self.view.subviews {
+ if !view.isKindOfClass(UINavigationBar){
+ view.userInteractionEnabled = false
+ }
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = false
+ }
+ }
+
+ func revealController(revealController: SWRevealViewController!, willMoveToPosition position: FrontViewPosition) {
+ if(position == FrontViewPosition.Left) {
+ for view in self.view.subviews {
+ view.userInteractionEnabled = true
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = true
+ } else {
+ for view in self.view.subviews {
+ if !view.isKindOfClass(UINavigationBar){
+ view.userInteractionEnabled = false
+ }
+
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = false
+ }
+ }
+}
+
// MARK: - Navigation
extension ItemTableViewController {
diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard
index 7b38667..226e310 100755
--- a/Vendoo/Main.storyboard
+++ b/Vendoo/Main.storyboard
@@ -1561,7 +1561,7 @@
-
+
@@ -1637,7 +1637,7 @@
-
+
@@ -1654,7 +1654,7 @@
-
+
diff --git a/Vendoo/NetworksTableViewController.swift b/Vendoo/NetworksTableViewController.swift
index ac55bd2..d80a6c5 100644
--- a/Vendoo/NetworksTableViewController.swift
+++ b/Vendoo/NetworksTableViewController.swift
@@ -17,6 +17,7 @@
import UIKit
import Foundation
+import SWRevealViewController
class NetworksTableViewController: UIViewController {
@@ -63,6 +64,10 @@ class NetworksTableViewController: UIViewController {
}
+ override func viewDidAppear(animated: Bool) {
+ (menuButton.target as! SWRevealViewController).delegate = self
+ }
+
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
@@ -118,6 +123,42 @@ extension NetworksTableViewController {
}
+// MARK: - Side Menu View
+extension NetworksTableViewController: SWRevealViewControllerDelegate {
+ func revealController(revealController: SWRevealViewController!, didMoveToPosition position: FrontViewPosition) {
+ if(position == FrontViewPosition.Left) {
+ for view in self.view.subviews {
+ view.userInteractionEnabled = true
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = true
+ } else {
+ for view in self.view.subviews {
+ if !view.isKindOfClass(UINavigationBar){
+ view.userInteractionEnabled = false
+ }
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = false
+ }
+ }
+
+ func revealController(revealController: SWRevealViewController!, willMoveToPosition position: FrontViewPosition) {
+ if(position == FrontViewPosition.Left) {
+ for view in self.view.subviews {
+ view.userInteractionEnabled = true
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = true
+ } else {
+ for view in self.view.subviews {
+ if !view.isKindOfClass(UINavigationBar){
+ view.userInteractionEnabled = false
+ }
+
+ }
+ self.tabBarController?.tabBar.userInteractionEnabled = false
+ }
+ }
+}
+
// MARK: - Navigation
extension NetworksTableViewController {