mirror of
https://bitbucket.org/vendoo/vendoo_v1.0.git
synced 2025-12-25 11:47:40 +00:00
Merged branch Display-Privacy-Policy-And-Getting-Started-Through-Menu into master
This commit is contained in:
Okechi Onyeje
commit
88e2de116f
@ -28,6 +28,7 @@
|
||||
3E7CF3FC1CF5FE9400F486B2 /* RecoverPasswordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7CF3FB1CF5FE9400F486B2 /* RecoverPasswordViewController.swift */; };
|
||||
3E7CF3FE1CF5FF8200F486B2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3E7CF3FD1CF5FF8200F486B2 /* GoogleService-Info.plist */; };
|
||||
3E7CF4011CF6366300F486B2 /* EtsyRESTAPIManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7CF4001CF6366300F486B2 /* EtsyRESTAPIManager.swift */; };
|
||||
3E93DEDB1E15C3D800849ED6 /* ExternalWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DEDA1E15C3D800849ED6 /* ExternalWebViewController.swift */; };
|
||||
3EA668A11D02836C00EE57A8 /* EbayWebServiceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA668A01D02836C00EE57A8 /* EbayWebServiceManager.swift */; };
|
||||
3EB2F5161CF442CF002E6D2C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EB2F5151CF442CF002E6D2C /* Security.framework */; };
|
||||
3EB54E0E1DE08A2E006D918B /* NetworkCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EB54E0D1DE08A2E006D918B /* NetworkCollectionViewCell.swift */; };
|
||||
@ -97,6 +98,7 @@
|
||||
3E7CF3FB1CF5FE9400F486B2 /* RecoverPasswordViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecoverPasswordViewController.swift; sourceTree = "<group>"; };
|
||||
3E7CF3FD1CF5FF8200F486B2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
|
||||
3E7CF4001CF6366300F486B2 /* EtsyRESTAPIManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EtsyRESTAPIManager.swift; sourceTree = "<group>"; };
|
||||
3E93DEDA1E15C3D800849ED6 /* ExternalWebViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExternalWebViewController.swift; sourceTree = "<group>"; };
|
||||
3EA668961D026E7800EE57A8 /* Vendoo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Vendoo-Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
3EA668A01D02836C00EE57A8 /* EbayWebServiceManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EbayWebServiceManager.swift; sourceTree = "<group>"; };
|
||||
3EA668A21D02ECB100EE57A8 /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
|
||||
@ -267,6 +269,14 @@
|
||||
name = EtsyServices;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
3E93DED91E15C38300849ED6 /* Web Views */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3E93DEDA1E15C3D800849ED6 /* ExternalWebViewController.swift */,
|
||||
);
|
||||
name = "Web Views";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
3EA668941D026E2A00EE57A8 /* EbayServices */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@ -349,6 +359,7 @@
|
||||
3EFB0E2F1D0B95B200A05D7A /* Menu */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3E93DED91E15C38300849ED6 /* Web Views */,
|
||||
3EE734E41DCD347900F771AE /* Notifications */,
|
||||
3E1AA4331D0DD0B2005FCCBB /* Settings */,
|
||||
3EFB0E321D0B968300A05D7A /* SideMenuView.swift */,
|
||||
@ -774,6 +785,7 @@
|
||||
3E6CC3571CF2A94B00E00A70 /* AppDelegate.swift in Sources */,
|
||||
3EC3251E1CF734C100626C48 /* NetworksTableViewController.swift in Sources */,
|
||||
3EC325201CF7C3AB00626C48 /* NetworkTableViewCell.swift in Sources */,
|
||||
3E93DEDB1E15C3D800849ED6 /* ExternalWebViewController.swift in Sources */,
|
||||
3EC325261CF7E90000626C48 /* FacebookGraphAPIManager.swift in Sources */,
|
||||
3E7CF3FC1CF5FE9400F486B2 /* RecoverPasswordViewController.swift in Sources */,
|
||||
3E1DC3CF1D42328C0091BC60 /* CategoryCell.swift in Sources */,
|
||||
|
||||
Binary file not shown.
@ -6,7 +6,7 @@
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ItemTableViewController.swift"
|
||||
@ -67,5 +67,321 @@
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ItemTableViewController.swift"
|
||||
timestampString = "504755002.558106"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "88"
|
||||
endingLineNumber = "88"
|
||||
landmarkName = "segSwitch(_:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504757534.091052"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "140"
|
||||
endingLineNumber = "140"
|
||||
landmarkName = "MenuPanelViewController"
|
||||
landmarkType = "3">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504756693.881355"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "15"
|
||||
endingLineNumber = "15"
|
||||
landmarkName = "MenuPanelViewController"
|
||||
landmarkType = "3">
|
||||
<Locations>
|
||||
<Location
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.MenuPanelViewController.count.getter : Swift.Int"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504763956.717651"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "15"
|
||||
endingLineNumber = "15"
|
||||
offsetFromSymbolStart = "19">
|
||||
</Location>
|
||||
<Location
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.MenuPanelViewController.count.setter : Swift.Int"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504763956.717752"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "15"
|
||||
endingLineNumber = "15"
|
||||
offsetFromSymbolStart = "23">
|
||||
</Location>
|
||||
<Location
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.MenuPanelViewController.init (nibName : Swift.Optional<Swift.String>, bundle : Swift.Optional<__ObjC.NSBundle>) -> Vendoo.MenuPanelViewController"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504763956.717837"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "15"
|
||||
endingLineNumber = "15"
|
||||
offsetFromSymbolStart = "57">
|
||||
</Location>
|
||||
<Location
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.MenuPanelViewController.init (coder : __ObjC.NSCoder) -> Swift.Optional<Vendoo.MenuPanelViewController>"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504763956.717917"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "15"
|
||||
endingLineNumber = "15"
|
||||
offsetFromSymbolStart = "19">
|
||||
</Location>
|
||||
</Locations>
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504757491.577779"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "96"
|
||||
endingLineNumber = "96"
|
||||
landmarkName = "tableView(_:cellForRowAtIndexPath:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504757521.054217"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "50"
|
||||
endingLineNumber = "50"
|
||||
landmarkName = "tableView(_:didSelectRowAtIndexPath:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "No"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766044.982825"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "94"
|
||||
endingLineNumber = "94"
|
||||
landmarkName = "segSwitcher(_:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766044.982825"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "101"
|
||||
endingLineNumber = "101"
|
||||
landmarkName = "segSwitcher(_:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766044.982825"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "81"
|
||||
endingLineNumber = "81"
|
||||
landmarkName = "webView(_:shouldStartLoadWithRequest:navigationType:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766044.982825"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "85"
|
||||
endingLineNumber = "85"
|
||||
landmarkName = "webViewDidFinishLoad(_:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/MenuPanelViewController.swift"
|
||||
timestampString = "504763946.426514"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "69"
|
||||
endingLineNumber = "69"
|
||||
landmarkName = "tableView(_:didSelectRowAtIndexPath:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766044.982825"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "32"
|
||||
endingLineNumber = "32"
|
||||
landmarkName = "ExternalWebViewController"
|
||||
landmarkType = "3">
|
||||
<Locations>
|
||||
<Location
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.ExternalWebViewController.contentStringUrlType.getter : Swift.Optional<Swift.String>"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766122.581369"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "32"
|
||||
endingLineNumber = "32"
|
||||
offsetFromSymbolStart = "80">
|
||||
</Location>
|
||||
<Location
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.ExternalWebViewController.contentStringUrlType.setter : Swift.Optional<Swift.String>"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766122.581543"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "32"
|
||||
endingLineNumber = "32"
|
||||
offsetFromSymbolStart = "172">
|
||||
</Location>
|
||||
<Location
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.ExternalWebViewController.init (nibName : Swift.Optional<Swift.String>, bundle : Swift.Optional<__ObjC.NSBundle>) -> Vendoo.ExternalWebViewController"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766122.581743"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "32"
|
||||
endingLineNumber = "32"
|
||||
offsetFromSymbolStart = "488">
|
||||
</Location>
|
||||
<Location
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
symbolName = "Vendoo.ExternalWebViewController.init (coder : __ObjC.NSCoder) -> Swift.Optional<Vendoo.ExternalWebViewController>"
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504766122.58194"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "32"
|
||||
endingLineNumber = "32"
|
||||
offsetFromSymbolStart = "394">
|
||||
</Location>
|
||||
</Locations>
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
<BreakpointProxy
|
||||
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
|
||||
<BreakpointContent
|
||||
shouldBeEnabled = "Yes"
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/ExternalWebViewController.swift"
|
||||
timestampString = "504764648.887768"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "42"
|
||||
endingLineNumber = "42"
|
||||
landmarkName = "viewDidLoad()"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
</BreakpointProxy>
|
||||
</Breakpoints>
|
||||
</Bucket>
|
||||
|
||||
BIN
Vendoo/.DS_Store
vendored
BIN
Vendoo/.DS_Store
vendored
Binary file not shown.
@ -37,6 +37,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
|
||||
}
|
||||
|
||||
|
||||
|
||||
self.window?.rootViewController = view
|
||||
self.window?.makeKeyAndVisible()
|
||||
|
||||
|
||||
131
Vendoo/ExternalWebViewController.swift
Normal file
131
Vendoo/ExternalWebViewController.swift
Normal file
@ -0,0 +1,131 @@
|
||||
//
|
||||
// ExternalWebViewController.swift
|
||||
// Vendoo
|
||||
//
|
||||
// Created by Okechi Onyeje on 12/29/16.
|
||||
// Copyright © 2016 Okechi Onyeje. All rights reserved.
|
||||
//
|
||||
|
||||
import UIKit
|
||||
|
||||
enum WebContent {
|
||||
case FAQ
|
||||
case GetStarted
|
||||
}
|
||||
|
||||
class ExternalWebViewController: UIViewController, UIWebViewDelegate {
|
||||
|
||||
@IBOutlet weak var webView: UIWebView!
|
||||
|
||||
@IBOutlet weak var webViewSelector: UISegmentedControl!
|
||||
|
||||
//var activity: UIActivityIndicatorView!
|
||||
|
||||
//contanst urls for the various app web documents on hosted website
|
||||
final let privPolicy = "http://vendoo.co/privacy-policy/"
|
||||
final let termsCond = "http://vendoo.co/terms-conditions/"
|
||||
final let getStarted = "http://vendoo.co"
|
||||
|
||||
var allowLoad = true
|
||||
var currIndex: Int!
|
||||
|
||||
var contentStringUrlType: String?
|
||||
var content: WebContent!
|
||||
var url: NSURL!
|
||||
|
||||
|
||||
//controller selection
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
contentStringUrlType = (NSUserDefaults.standardUserDefaults().objectForKey("whichContent") as? String)
|
||||
//content = ((contentStringUrlType == "FAQ") ? WebContent.FAQ : WebContent.GetStarted)
|
||||
self.webView.delegate = self
|
||||
self.webView.dataDetectorTypes = UIDataDetectorTypes.None
|
||||
|
||||
// Do any additional setup after loading the view.
|
||||
|
||||
//self.activity = UIActivityIndicatorView(activityIndicatorStyle: UIActivityIndicatorViewStyle.Gray)
|
||||
//self.activity.color = UIColor.purpleColor()
|
||||
//self.activity.backgroundColor = UIColor.grayColor()
|
||||
//self.activity.frame = self.webView.frame;
|
||||
|
||||
content = ((contentStringUrlType == "FAQ") ? WebContent.FAQ : WebContent.GetStarted)
|
||||
if (self.content == WebContent.FAQ){
|
||||
webViewSelector.hidden = false
|
||||
webViewSelector.enabled = true
|
||||
|
||||
if(webViewSelector.selectedSegmentIndex == 0){
|
||||
url = NSURL (string: termsCond)
|
||||
}else{
|
||||
url = NSURL (string: privPolicy)
|
||||
}
|
||||
currIndex = webViewSelector.selectedSegmentIndex
|
||||
}else{
|
||||
webViewSelector.hidden = true
|
||||
webViewSelector.enabled = false
|
||||
|
||||
url = NSURL (string: getStarted);
|
||||
|
||||
}
|
||||
|
||||
let requestObj = NSURLRequest(URL: url!);
|
||||
webView.loadRequest(requestObj);
|
||||
}
|
||||
|
||||
/*
|
||||
// MARK: - WebView
|
||||
*/
|
||||
|
||||
func webView(webView: UIWebView, shouldStartLoadWithRequest request: NSURLRequest, navigationType: UIWebViewNavigationType) -> Bool {
|
||||
return allowLoad
|
||||
}
|
||||
|
||||
func webViewDidFinishLoad(webView: UIWebView) {
|
||||
allowLoad = false
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
//MARK: - SegmentControl
|
||||
*/
|
||||
@IBAction func segSwitcher(sender: UISegmentedControl) {
|
||||
if(!(self.currIndex == self.webViewSelector.selectedSegmentIndex)){
|
||||
|
||||
if (self.webViewSelector.selectedSegmentIndex == 0){
|
||||
let requestObj = NSURLRequest(URL: NSURL (string: termsCond)!);
|
||||
webView.loadRequest(requestObj);
|
||||
}else{
|
||||
let requestObj = NSURLRequest(URL: NSURL (string: privPolicy)!);
|
||||
webView.loadRequest(requestObj);
|
||||
}
|
||||
|
||||
self.currIndex = self.webViewSelector.selectedSegmentIndex
|
||||
self.allowLoad = true
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@IBAction func navigateBack(sender: UIButton) {
|
||||
|
||||
let storyboard = UIStoryboard(name: "Main", bundle: nil)
|
||||
let vc = storyboard.instantiateViewControllerWithIdentifier("Reveal View Controller")
|
||||
self.presentViewController(vc, animated: true, completion: {
|
||||
NSUserDefaults.standardUserDefaults().removeObjectForKey("whichContent")
|
||||
//self.parentViewController!.dismissViewControllerAnimated(true, completion: nil)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
// MARK: - Navigation
|
||||
|
||||
// In a storyboard-based application, you will often want to do a little preparation before navigation
|
||||
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
|
||||
// Get the new view controller using segue.destinationViewController.
|
||||
// Pass the selected object to the new view controller.
|
||||
}
|
||||
*/
|
||||
}
|
||||
@ -32,6 +32,7 @@ class HomeViewController: UITabBarController {
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
NSUserDefaults.standardUserDefaults().removeObjectForKey("whichContent") //used to reset which webview is loaded in Faq and get started pages
|
||||
|
||||
//initialize notifications manager
|
||||
ServiceNotificationManager.delegate = self
|
||||
|
||||
@ -70,7 +70,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-75.5" y="-624.5"/>
|
||||
<point key="canvasLocation" x="-495.5" y="-616.5"/>
|
||||
</scene>
|
||||
<!--recoverPassword-->
|
||||
<scene sceneID="u6U-fS-FoE">
|
||||
@ -139,7 +139,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="dyw-ta-pq5" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-495.5" y="117.5"/>
|
||||
<point key="canvasLocation" x="-739.5" y="125.5"/>
|
||||
</scene>
|
||||
<!--Reveal View Controller-->
|
||||
<scene sceneID="8cL-oN-FIo">
|
||||
@ -232,7 +232,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="2JU-bb-oUW" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-495.5" y="-624.5"/>
|
||||
<point key="canvasLocation" x="-935.5" y="-616.5"/>
|
||||
</scene>
|
||||
<!--camera-->
|
||||
<scene sceneID="R99-0r-4lb">
|
||||
@ -459,7 +459,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="q1f-dh-MHj" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1680.5" y="-1376.5"/>
|
||||
<point key="canvasLocation" x="2060.5" y="-1376.5"/>
|
||||
</scene>
|
||||
<!--Select Marketplaces-->
|
||||
<scene sceneID="Psr-WG-l4G">
|
||||
@ -737,7 +737,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="6Ls-Ti-JQK" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1680.5" y="117.5"/>
|
||||
<point key="canvasLocation" x="2060.5" y="117.5"/>
|
||||
</scene>
|
||||
<!--Amazon Settings-->
|
||||
<scene sceneID="UtJ-fv-dWo">
|
||||
@ -802,7 +802,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="Th4-RA-XA4" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="2113.5" y="117.5"/>
|
||||
<point key="canvasLocation" x="2537.5" y="117.5"/>
|
||||
</scene>
|
||||
<!--Listing Preview-->
|
||||
<scene sceneID="Qqe-CL-BDJ">
|
||||
@ -1035,7 +1035,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="RMw-dN-MlZ" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1680.5" y="868.5"/>
|
||||
<point key="canvasLocation" x="2060.5" y="860.5"/>
|
||||
</scene>
|
||||
<!--Etsy Settings-->
|
||||
<scene sceneID="8bB-5M-lMz">
|
||||
@ -1166,7 +1166,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="aJW-kP-VJj" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="2113.5" y="868.5"/>
|
||||
<point key="canvasLocation" x="2537.5" y="860.5"/>
|
||||
</scene>
|
||||
<!--items-->
|
||||
<scene sceneID="mgQ-vQ-YQl">
|
||||
@ -1310,7 +1310,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="rIQ-Hu-DM0" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1241.5" y="-1376.5"/>
|
||||
<point key="canvasLocation" x="1553.5" y="-1376.5"/>
|
||||
</scene>
|
||||
<!--Home View Controller-->
|
||||
<scene sceneID="NWa-1L-Ttk">
|
||||
@ -1331,7 +1331,7 @@
|
||||
</tabBarController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="ZSn-Vl-mTM" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="783.5" y="-1384.5"/>
|
||||
<point key="canvasLocation" x="975.5" y="-1384.5"/>
|
||||
</scene>
|
||||
<!--Menu-->
|
||||
<scene sceneID="3RQ-FG-M3p">
|
||||
@ -1480,6 +1480,9 @@
|
||||
</imageView>
|
||||
</subviews>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<segue destination="boA-fE-0DD" kind="custom" customClass="SWRevealViewControllerSeguePushController" id="4p9-5v-r1k"/>
|
||||
</connections>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Getting_Started_Cell" id="Usj-YV-mfI">
|
||||
<rect key="frame" x="0.0" y="221" width="375" height="44"/>
|
||||
@ -1501,6 +1504,9 @@
|
||||
</imageView>
|
||||
</subviews>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<segue destination="boA-fE-0DD" kind="custom" customClass="SWRevealViewControllerSeguePushController" id="qb4-wt-avv"/>
|
||||
</connections>
|
||||
</tableViewCell>
|
||||
</prototypes>
|
||||
</tableView>
|
||||
@ -1548,7 +1554,7 @@
|
||||
</navigationController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="JcV-kO-gWj" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="783.5" y="117.5"/>
|
||||
<point key="canvasLocation" x="323.5" y="189.5"/>
|
||||
</scene>
|
||||
<!--Notifications-->
|
||||
<scene sceneID="bwB-9L-Y2n">
|
||||
@ -1564,7 +1570,7 @@
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<prototypes>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="notification_cell" rowHeight="69" id="9G8-XI-ptI" customClass="NotificationTableViewCell" customModule="Vendoo" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="28" width="375" height="69"/>
|
||||
<rect key="frame" x="0.0" y="72" width="375" height="69"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9G8-XI-ptI" id="r3f-6Q-p1g">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="68.5"/>
|
||||
@ -1607,7 +1613,62 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="34F-M2-Thr" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="783.5" y="868.5"/>
|
||||
<point key="canvasLocation" x="323.5" y="940.5"/>
|
||||
</scene>
|
||||
<!--FAQ-->
|
||||
<scene sceneID="5Gh-Dc-5IY">
|
||||
<objects>
|
||||
<viewController title="FAQ" id="boA-fE-0DD" customClass="ExternalWebViewController" customModule="Vendoo" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="E7b-s5-8b2">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="ax6-lY-AY4">
|
||||
<rect key="frame" x="0.0" y="41" width="375" height="29"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" red="0.891717640799357" green="0.93282781859999997" blue="0.92491716525804946" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<segments>
|
||||
<segment title="Terms & Conditions"/>
|
||||
<segment title="Privacy Policy"/>
|
||||
</segments>
|
||||
<connections>
|
||||
<action selector="segSwitcher:" destination="boA-fE-0DD" eventType="valueChanged" id="1Ut-jz-PpF"/>
|
||||
</connections>
|
||||
</segmentedControl>
|
||||
<webView contentMode="scaleToFill" scalesPageToFit="YES" id="90w-yh-Hsa">
|
||||
<rect key="frame" x="9" y="105" width="356" height="457"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="deviceRGB"/>
|
||||
</webView>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="2PQ-QL-mA0">
|
||||
<rect key="frame" x="112" y="570" width="151" height="77"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" red="0.17963047153802744" green="0.9708063853539266" blue="0.82509178019740859" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="22"/>
|
||||
<color key="tintColor" red="0.7931379808779494" green="0.93282781859999997" blue="0.90501418412773915" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<state key="normal" title="Back"/>
|
||||
<connections>
|
||||
<action selector="navigateBack:" destination="boA-fE-0DD" eventType="touchUpInside" id="xYh-bo-MpN"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.79313798089999998" green="0.93282781859999997" blue="0.90501418410000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
</view>
|
||||
<extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
|
||||
<navigationItem key="navigationItem" title="FAQ" id="yKO-Ow-koP">
|
||||
<barButtonItem key="leftBarButtonItem" systemItem="stop" id="hrp-P4-gsK">
|
||||
<color key="tintColor" red="0.2784313725" green="0.80392156859999997" blue="0.68235294120000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
</barButtonItem>
|
||||
</navigationItem>
|
||||
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
|
||||
<connections>
|
||||
<outlet property="webView" destination="90w-yh-Hsa" id="1Yu-bi-6ji"/>
|
||||
<outlet property="webViewSelector" destination="ax6-lY-AY4" id="2HY-pu-dpe"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="P3M-Ve-0F7" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="730.5" y="189.5"/>
|
||||
</scene>
|
||||
<!--Navigation Controller-->
|
||||
<scene sceneID="fTi-5a-Ts4">
|
||||
@ -1624,7 +1685,7 @@
|
||||
</navigationController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="2fq-he-yeA" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="352.5" y="117.5"/>
|
||||
<point key="canvasLocation" x="-75.5" y="189.5"/>
|
||||
</scene>
|
||||
<!--Settings-->
|
||||
<scene sceneID="rQk-fJ-wBx">
|
||||
@ -1640,7 +1701,7 @@
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<prototypes>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Change_Pass_Cell" id="ceq-sl-ClT">
|
||||
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
|
||||
<rect key="frame" x="0.0" y="72" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ceq-sl-ClT" id="Waq-fu-UxD">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
|
||||
@ -1657,7 +1718,7 @@
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Delete_Account_Cell" id="Lha-cf-Sfc">
|
||||
<rect key="frame" x="0.0" y="72" width="375" height="44"/>
|
||||
<rect key="frame" x="0.0" y="116" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Lha-cf-Sfc" id="kmF-Sb-d0c">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
|
||||
@ -1693,7 +1754,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="Wij-7A-2ap" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="352.5" y="868.5"/>
|
||||
<point key="canvasLocation" x="-75.5" y="940.5"/>
|
||||
</scene>
|
||||
<!--Manage Marketplaces-->
|
||||
<scene sceneID="ZoD-ex-KWn">
|
||||
@ -1964,7 +2025,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="wgJ-Et-iET" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="2113.5" y="-1376.5"/>
|
||||
<point key="canvasLocation" x="2537.5" y="-1376.5"/>
|
||||
</scene>
|
||||
<!--Category Pop Up Controller-->
|
||||
<scene sceneID="PQM-UG-Hik">
|
||||
@ -2015,7 +2076,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="kG7-XU-wBG" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1178.5" y="-649.5"/>
|
||||
<point key="canvasLocation" x="1553.5" y="-616.5"/>
|
||||
</scene>
|
||||
<!--categories-->
|
||||
<scene sceneID="e5k-kQ-o33">
|
||||
@ -2154,7 +2215,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="VhZ-aP-JDs" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="1654.5" y="-649.5"/>
|
||||
<point key="canvasLocation" x="2060.5" y="-616.5"/>
|
||||
</scene>
|
||||
<!--Ebay Settings-->
|
||||
<scene sceneID="bc4-4H-BM8">
|
||||
@ -2391,7 +2452,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="Oyc-F3-ucg" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="2113.5" y="-624.5"/>
|
||||
<point key="canvasLocation" x="2537.5" y="-616.5"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
@ -2415,12 +2476,13 @@
|
||||
<image name="start" width="50" height="50"/>
|
||||
</resources>
|
||||
<inferredMetricsTieBreakers>
|
||||
<segue reference="vCG-jU-HYF"/>
|
||||
<segue reference="NOz-ya-avj"/>
|
||||
<segue reference="syc-IR-LNQ"/>
|
||||
<segue reference="nWA-7e-2Ec"/>
|
||||
<segue reference="KKl-Gj-ZVc"/>
|
||||
<segue reference="rkZ-c8-XJc"/>
|
||||
<segue reference="Ogu-p5-UtK"/>
|
||||
<segue reference="Ds4-LY-IRj"/>
|
||||
<segue reference="Gnt-iE-cW9"/>
|
||||
<segue reference="eaI-bm-1aI"/>
|
||||
<segue reference="nUj-1v-ftF"/>
|
||||
<segue reference="qb4-wt-avv"/>
|
||||
</inferredMetricsTieBreakers>
|
||||
<color key="tintColor" red="0.2784313725" green="0.80392156859999997" blue="0.68235294120000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
</document>
|
||||
|
||||
@ -46,7 +46,36 @@ class MenuPanelViewController: UIViewController{
|
||||
|
||||
extension MenuPanelViewController: UITableViewDelegate
|
||||
{
|
||||
func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
|
||||
switch(indexPath.row){
|
||||
|
||||
//display user name and email
|
||||
case 0:
|
||||
|
||||
break
|
||||
|
||||
//display notification count
|
||||
case 1:
|
||||
break
|
||||
//display settings cell
|
||||
case 2:
|
||||
break
|
||||
|
||||
//display analytics (next iteration)
|
||||
case 3:
|
||||
break
|
||||
|
||||
//display FAQ cell
|
||||
case 4:
|
||||
NSUserDefaults.standardUserDefaults().setObject("FAQ", forKey: "whichContent")
|
||||
break
|
||||
|
||||
//display how to cell
|
||||
default:
|
||||
NSUserDefaults.standardUserDefaults().setObject("Getting_Started", forKey: "whichContent")
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension MenuPanelViewController: UITableViewDataSource
|
||||
@ -96,6 +125,7 @@ extension MenuPanelViewController: UITableViewDataSource
|
||||
//display FAQ cell
|
||||
case 4:
|
||||
cell = self.table.dequeueReusableCellWithIdentifier("FAQ_Cell")!
|
||||
|
||||
break
|
||||
|
||||
//display how to cell
|
||||
@ -107,6 +137,8 @@ extension MenuPanelViewController: UITableViewDataSource
|
||||
return cell
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
extension MenuPanelViewController{
|
||||
|
||||
@ -37,6 +37,7 @@ class SignInViewController: UIViewController {
|
||||
|
||||
let dictionary = Locksmith.loadDataForUserAccount(self.email.text!, inService: "vendoo")
|
||||
self.password.text = dictionary!["pass"] as? String
|
||||
|
||||
signInUser(self)
|
||||
}else{
|
||||
print("user not found")
|
||||
@ -96,6 +97,7 @@ extension SignInViewController {
|
||||
NSUserDefaults.standardUserDefaults().setBool(true, forKey: "signedIn")
|
||||
NSUserDefaults.standardUserDefaults().setObject(self.email.text, forKey: "email")
|
||||
|
||||
|
||||
//save data to keychain
|
||||
do{
|
||||
try Locksmith.saveData(["pass": self.password.text!], forUserAccount: self.email.text!, inService: "vendoo")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user