oonyeje/vendoo_v1.0
1
0
Fork 0
mirror of https://bitbucket.org/vendoo/vendoo_v1.0.git synced 2025-12-25 11:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged branch BUG-Fix-Login-Logout-Buttons-For-Networks into master

Browse Source
This commit is contained in:
Okechi Onyeje 2016-11-19 20:31:36 -05:00
commit fc98abd596
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

4
Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -525,8 +525,8 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "611" startingLineNumber = "611"
endingLineNumber = "611" endingLineNumber = "611"
landmarkName = "EtsyRESTAPIManager" landmarkName = "sendGETRequest(_:onCompletion:)"
landmarkType = "3"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy

4
Vendoo/EtsyRESTAPIManager.swift
View File

@ -105,7 +105,7 @@ class EtsyRESTAPIManager: NSObject {
extension EtsyRESTAPIManager { extension EtsyRESTAPIManager {
//makes application ready for use with users etsy account //makes application ready for use with users etsy account
func authorizeApp(viewcontroller: UIViewController){ func authorizeApp(viewcontroller: UIViewController, onComplete: ServiceResponse!){
var boolResult: Bool! var boolResult: Bool!
@ -225,6 +225,8 @@ extension EtsyRESTAPIManager {
EtsyRESTAPIManager.settingsDictionary["userID"] = dict2[0]["login_name"]! EtsyRESTAPIManager.settingsDictionary["userID"] = dict2[0]["login_name"]!
NSUserDefaults.standardUserDefaults().setObject(EtsyRESTAPIManager.settingsDictionary, forKey: "etsySettings") NSUserDefaults.standardUserDefaults().setObject(EtsyRESTAPIManager.settingsDictionary, forKey: "etsySettings")
onComplete(nil,nil)
self.sendGETRequest("/private/shops/__SELF__/payment_templates", onCompletion: { self.sendGETRequest("/private/shops/__SELF__/payment_templates", onCompletion: {
(data, error) -> Void in (data, error) -> Void in

6
Vendoo/FacebookGraphAPIManager.swift
View File

@ -65,7 +65,7 @@ class FacebookGraphAPIManager: NSObject {
//MARK: - OAuth Methods //MARK: - OAuth Methods
extension FacebookGraphAPIManager { extension FacebookGraphAPIManager {
func authorizeApp(viewcontroller: UIViewController) -> Bool{ func authorizeApp(viewcontroller: UIViewController, onComplete: ServiceResponse!) -> Bool{
login.loginBehavior = FBSDKLoginBehavior.Web login.loginBehavior = FBSDKLoginBehavior.Web
if(!self.isAuthorized){ if(!self.isAuthorized){
@ -107,11 +107,13 @@ extension FacebookGraphAPIManager {
NSUserDefaults.standardUserDefaults().setBool(true, forKey:"fbAuthorized") NSUserDefaults.standardUserDefaults().setBool(true, forKey:"fbAuthorized")
self.isAuthorized = true self.isAuthorized = true
onComplete(nil,nil)
}) })
}) })
}else{
onComplete(nil,nil)
} }
} }

10
Vendoo/NetworksTableViewController.swift
View File

@ -800,21 +800,27 @@ extension NetworksTableViewController {
break break
case is EtsyTableViewCell.Type: case is EtsyTableViewCell.Type:
let tabBar = self.tabBarController let tabBar = self.tabBarController
((tabBar as? HomeViewController)?.etsyManager.authorizeApp(self))! ((tabBar as? HomeViewController)?.etsyManager.authorizeApp(self, onComplete: {
something , _ -> Void in
dispatch_async(dispatch_get_main_queue(), { dispatch_async(dispatch_get_main_queue(), {
sender.setTitle("Logout", forState: UIControlState.Normal) sender.setTitle("Logout", forState: UIControlState.Normal)
(sender.superview?.superview as! EtsyTableViewCell).settingsBtn.enabled = true (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.enabled = true
(sender.superview?.superview as! EtsyTableViewCell).settingsBtn.hidden = false (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.hidden = false
}) })
}))!
break break
case is FBTableViewCell.Type: case is FBTableViewCell.Type:
let tabBar = self.tabBarController let tabBar = self.tabBarController
((tabBar as? HomeViewController)?.fbGraphManager.authorizeApp(self))! ((tabBar as? HomeViewController)?.fbGraphManager.authorizeApp(self, onComplete: {
something , _ -> Void in
dispatch_async(dispatch_get_main_queue(), { dispatch_async(dispatch_get_main_queue(), {
sender.setTitle("Logout", forState: UIControlState.Normal) sender.setTitle("Logout", forState: UIControlState.Normal)
(sender.superview?.superview as! FBTableViewCell).settingsBtn.enabled = true (sender.superview?.superview as! FBTableViewCell).settingsBtn.enabled = true
(sender.superview?.superview as! FBTableViewCell).settingsBtn.hidden = false (sender.superview?.superview as! FBTableViewCell).settingsBtn.hidden = false
}) })
}))!
break break
default: default: