Merged branch Seller-Networks-Settings into master

This commit is contained in:
Okechi Onyeje 2016-07-16 09:41:57 -04:00
commit ecb43d0355
4 changed files with 286 additions and 231 deletions

View File

@ -32,6 +32,7 @@ class EtsyRESTAPIManager: NSObject {
private var apiSecret: String!
private var userEmail:String = (NSUserDefaults.standardUserDefaults().objectForKey("email") as? String)!
var isAuthorized: Bool = NSUserDefaults.standardUserDefaults().boolForKey("etsyAuthorized")
static var settingsDictionary = Dictionary<String , AnyObject>()
//---------------------------------------------//
//User specific class variables
@ -64,6 +65,22 @@ class EtsyRESTAPIManager: NSObject {
/*scope=listings_w%20listings_r%20listings_d%20transactions_r%20transactions_w"*/
if(NSUserDefaults.standardUserDefaults().boolForKey("etsyDefaultsOverriden")) {
EtsyRESTAPIManager.settingsDictionary = (NSUserDefaults.standardUserDefaults().objectForKey("etsySettings") as? Dictionary<String, AnyObject>)!
}
else{
EtsyRESTAPIManager.settingsDictionary = ([
"who_made":"i_did",
"is_supply":"true",
"when_made":"made_to_order"
] as Dictionary<String, AnyObject>)
NSUserDefaults.standardUserDefaults().setObject(EtsyRESTAPIManager.settingsDictionary, forKey: "etsySettings")
NSUserDefaults.standardUserDefaults().setBool(true, forKey: "etsyDefaultsOverriden")
}
}
@ -181,14 +198,21 @@ extension EtsyRESTAPIManager {
self.oauthswift.client.credential.oauth_token = oauth!["token"]! as! String
self.oauthswift.client.credential.oauth_token_secret = oauth!["secret"]! as! String
self.oauthswift!.client.get("https://openapi.etsy.com/v2/oauth/scopes",
self.oauthswift!.client.get("https://openapi.etsy.com/v2/users/__SELF__",
success: {
data, response in
let dataString = NSString(data: data, encoding: NSUTF8StringEncoding)
let dict = self.convertStringToDictionary(dataString! as String)
print(dict)
var dict2 = (dict!["results"] as! [[String : AnyObject]])
let json1 = JSON(dataString!)
print(json1)
print(dataString)
boolResult = true
print(dict2[0]["login_name"]!)
EtsyRESTAPIManager.settingsDictionary["userID"] = dict2[0]["login_name"]!
NSUserDefaults.standardUserDefaults().setObject(EtsyRESTAPIManager.settingsDictionary, forKey: "etsySettings")
}
, failure: { error in
print(error)
@ -420,7 +444,7 @@ extension EtsyRESTAPIManager {
func convertStringToDictionary(text: String) -> [String:AnyObject]? {
if let data = text.dataUsingEncoding(NSUTF8StringEncoding) {
do {
return try NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingOptions.AllowFragments) as? [String:AnyObject]
return try NSJSONSerialization.JSONObjectWithData(data, options: []) as? [String:AnyObject]
} catch let error as NSError {
print(error)
}
@ -428,3 +452,4 @@ extension EtsyRESTAPIManager {
return nil
}
}

View File

@ -9,11 +9,30 @@
import UIKit
class EtsySettingsViewController: UIViewController {
var wereDefaultsChanged: Bool = NSUserDefaults.standardUserDefaults().boolForKey("etsyDefaultsOverriden")
@IBOutlet weak var userID: UILabel!
@IBOutlet weak var whoMadeBtn: UIButton!
@IBOutlet weak var isSupplierBtn: UIButton!
@IBOutlet weak var productAgeBtn: UIButton!
var etsyManager: EtsyRESTAPIManager!
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
if(wereDefaultsChanged) {
//change button labels to reflect user selected defaults
}
//dispatch_async(dispatch_get_main_queue(), {
print(EtsyRESTAPIManager.settingsDictionary["userID"] as? String)
self.userID.text = (EtsyRESTAPIManager.settingsDictionary["userID"] as! String)
//})
}
override func didReceiveMemoryWarning() {
@ -23,7 +42,7 @@ class EtsySettingsViewController: UIViewController {
/*
// MARK: - Navigation
// 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?) {
@ -44,3 +63,11 @@ extension EtsySettingsViewController {
}
}
//MARK:- Class Methods
extension EtsySettingsViewController {
func loadManager (etsyManager: EtsyRESTAPIManager) {
self.etsyManager = etsyManager
}
}

View File

@ -111,6 +111,9 @@ extension NetworksTableViewController {
(segue.destinationViewController as! ListingPreviewViewController).setManagers(self.graphManager, fireManager: self.firManager, ebayManager: self.ebayManager)
}
if(segue.identifier == "EtsySettingsSegue") {
(segue.destinationViewController as! EtsySettingsViewController).loadManager(self.etsyManager)
}
}
}