diff --git a/.DS_Store b/.DS_Store index 565035d..2e4d1af 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Vendoo.xcodeproj/project.pbxproj b/Vendoo.xcodeproj/project.pbxproj index 09d3c26..52b9da5 100644 --- a/Vendoo.xcodeproj/project.pbxproj +++ b/Vendoo.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 3E1AA4301D0D9B3F005FCCBB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3E1AA42F1D0D9B3F005FCCBB /* Main.storyboard */; }; 3E1AA4321D0DA071005FCCBB /* MenuPanelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1AA4311D0DA071005FCCBB /* MenuPanelViewController.swift */; }; 3E1AA4351D0DD173005FCCBB /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1AA4341D0DD173005FCCBB /* SettingsViewController.swift */; }; + 3E1B1F091D24926C00DBCF08 /* EbaySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1B1F081D24926C00DBCF08 /* EbaySettingsViewController.swift */; }; + 3E1B1F0B1D2493EE00DBCF08 /* EtsySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1B1F0A1D2493EE00DBCF08 /* EtsySettingsViewController.swift */; }; 3E4897D11D0067030069F742 /* FirebaseManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E4897D01D0067030069F742 /* FirebaseManager.swift */; }; 3E6CC3571CF2A94B00E00A70 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6CC3561CF2A94B00E00A70 /* AppDelegate.swift */; }; 3E6CC3591CF2A94B00E00A70 /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E6CC3581CF2A94B00E00A70 /* SignInViewController.swift */; }; @@ -67,6 +69,8 @@ 3E1AA42F1D0D9B3F005FCCBB /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; 3E1AA4311D0DA071005FCCBB /* MenuPanelViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuPanelViewController.swift; sourceTree = ""; }; 3E1AA4341D0DD173005FCCBB /* SettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; + 3E1B1F081D24926C00DBCF08 /* EbaySettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EbaySettingsViewController.swift; sourceTree = ""; }; + 3E1B1F0A1D2493EE00DBCF08 /* EtsySettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EtsySettingsViewController.swift; sourceTree = ""; }; 3E4897D01D0067030069F742 /* FirebaseManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirebaseManager.swift; sourceTree = ""; }; 3E6CC3531CF2A94B00E00A70 /* Vendoo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Vendoo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3E6CC3561CF2A94B00E00A70 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -230,6 +234,7 @@ isa = PBXGroup; children = ( 3E7CF4021CF644E400F486B2 /* EtsyObjects */, + 3E1B1F0A1D2493EE00DBCF08 /* EtsySettingsViewController.swift */, 3E7CF4001CF6366300F486B2 /* EtsyRESTAPIManager.swift */, ); name = EtsyServices; @@ -248,6 +253,7 @@ children = ( 3EA668951D026E4000EE57A8 /* ObjC */, 3EA668A01D02836C00EE57A8 /* EbayWebServiceManager.swift */, + 3E1B1F081D24926C00DBCF08 /* EbaySettingsViewController.swift */, ); name = EbayServices; sourceTree = ""; @@ -631,11 +637,13 @@ 3EC325111CF703A600626C48 /* ItemCell.swift in Sources */, 3EA668A11D02836C00EE57A8 /* EbayWebServiceManager.swift in Sources */, 3ECEDB871CF9C722003566B3 /* ListingPreviewViewController.swift in Sources */, + 3E1B1F0B1D2493EE00DBCF08 /* EtsySettingsViewController.swift in Sources */, 3EC325231CF7DA5500626C48 /* HomeViewController.swift in Sources */, 3EC3252D1CF894C400626C48 /* ItemImagePickerViewController.swift in Sources */, 3E7CF4011CF6366300F486B2 /* EtsyRESTAPIManager.swift in Sources */, 3EC325151CF7104300626C48 /* ItemTableViewController.swift in Sources */, 3EFB0E331D0B968300A05D7A /* SideMenuView.swift in Sources */, + 3E1B1F091D24926C00DBCF08 /* EbaySettingsViewController.swift in Sources */, 3E6CC3591CF2A94B00E00A70 /* SignInViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index 15a1b9b..8fc46f0 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 ed48354..4bb104f 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -19,5 +19,37 @@ landmarkType = "5"> + + + + + + + + diff --git a/Vendoo/.DS_Store b/Vendoo/.DS_Store index 7d1757a..c12975b 100644 Binary files a/Vendoo/.DS_Store and b/Vendoo/.DS_Store differ diff --git a/Vendoo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Vendoo/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 diff --git a/Vendoo/Assets.xcassets/Contents.json b/Vendoo/Assets.xcassets/Contents.json old mode 100644 new mode 100755 diff --git a/Vendoo/Assets.xcassets/LoginWithFacebook.imageset/Contents.json b/Vendoo/Assets.xcassets/LoginWithFacebook.imageset/Contents.json new file mode 100644 index 0000000..6e627a2 --- /dev/null +++ b/Vendoo/Assets.xcassets/LoginWithFacebook.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Facebook login@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/LoginWithFacebook.imageset/Facebook login@2x.png b/Vendoo/Assets.xcassets/LoginWithFacebook.imageset/Facebook login@2x.png new file mode 100644 index 0000000..e2964e1 Binary files /dev/null and b/Vendoo/Assets.xcassets/LoginWithFacebook.imageset/Facebook login@2x.png differ diff --git a/Vendoo/Assets.xcassets/Logo.imageset/Contents.json b/Vendoo/Assets.xcassets/Logo.imageset/Contents.json new file mode 100644 index 0000000..3dcc2da --- /dev/null +++ b/Vendoo/Assets.xcassets/Logo.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Screen Shot 2016-06-28 at 1.03.30 AM.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/Logo.imageset/Screen Shot 2016-06-28 at 1.03.30 AM.png b/Vendoo/Assets.xcassets/Logo.imageset/Screen Shot 2016-06-28 at 1.03.30 AM.png new file mode 100644 index 0000000..e9d7e6b Binary files /dev/null and b/Vendoo/Assets.xcassets/Logo.imageset/Screen Shot 2016-06-28 at 1.03.30 AM.png differ diff --git a/Vendoo/Assets.xcassets/add.imageset/Contents.json b/Vendoo/Assets.xcassets/add.imageset/Contents.json new file mode 100644 index 0000000..06a53bb --- /dev/null +++ b/Vendoo/Assets.xcassets/add.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Plus Math-100.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/add.imageset/Plus Math-100.png b/Vendoo/Assets.xcassets/add.imageset/Plus Math-100.png new file mode 100644 index 0000000..c6619ae Binary files /dev/null and b/Vendoo/Assets.xcassets/add.imageset/Plus Math-100.png differ diff --git a/Vendoo/Assets.xcassets/amazon_grey.imageset/Contents.json b/Vendoo/Assets.xcassets/amazon_grey.imageset/Contents.json new file mode 100644 index 0000000..0a5db87 --- /dev/null +++ b/Vendoo/Assets.xcassets/amazon_grey.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "amazon_grey@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/amazon_grey.imageset/amazon_grey@2x.png b/Vendoo/Assets.xcassets/amazon_grey.imageset/amazon_grey@2x.png new file mode 100644 index 0000000..0ddf9f2 Binary files /dev/null and b/Vendoo/Assets.xcassets/amazon_grey.imageset/amazon_grey@2x.png differ diff --git a/Vendoo/Assets.xcassets/amazon_icon.imageset/Contents.json b/Vendoo/Assets.xcassets/amazon_icon.imageset/Contents.json old mode 100644 new mode 100755 index 91f32da..7d96be5 --- a/Vendoo/Assets.xcassets/amazon_icon.imageset/Contents.json +++ b/Vendoo/Assets.xcassets/amazon_icon.imageset/Contents.json @@ -6,7 +6,7 @@ }, { "idiom" : "universal", - "filename" : "amazon-icon.png", + "filename" : "amazon@2x.png", "scale" : "2x" }, { diff --git a/Vendoo/Assets.xcassets/amazon_icon.imageset/amazon-icon.png b/Vendoo/Assets.xcassets/amazon_icon.imageset/amazon-icon.png deleted file mode 100644 index d6ea530..0000000 Binary files a/Vendoo/Assets.xcassets/amazon_icon.imageset/amazon-icon.png and /dev/null differ diff --git a/Vendoo/Assets.xcassets/amazon_icon.imageset/amazon@2x.png b/Vendoo/Assets.xcassets/amazon_icon.imageset/amazon@2x.png new file mode 100644 index 0000000..7af830b Binary files /dev/null and b/Vendoo/Assets.xcassets/amazon_icon.imageset/amazon@2x.png differ diff --git a/Vendoo/Assets.xcassets/camera.imageset/Contents.json b/Vendoo/Assets.xcassets/camera.imageset/Contents.json new file mode 100644 index 0000000..cc7769e --- /dev/null +++ b/Vendoo/Assets.xcassets/camera.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "camera@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/camera.imageset/camera@2x.png b/Vendoo/Assets.xcassets/camera.imageset/camera@2x.png new file mode 100644 index 0000000..6b0c19f Binary files /dev/null and b/Vendoo/Assets.xcassets/camera.imageset/camera@2x.png differ diff --git a/Vendoo/Assets.xcassets/cancel.imageset/Contents.json b/Vendoo/Assets.xcassets/cancel.imageset/Contents.json new file mode 100644 index 0000000..dc8961e --- /dev/null +++ b/Vendoo/Assets.xcassets/cancel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Delete-100.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Delete-500.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/cancel.imageset/Delete-100.png b/Vendoo/Assets.xcassets/cancel.imageset/Delete-100.png new file mode 100644 index 0000000..72b5449 Binary files /dev/null and b/Vendoo/Assets.xcassets/cancel.imageset/Delete-100.png differ diff --git a/Vendoo/Assets.xcassets/cancel.imageset/Delete-500.png b/Vendoo/Assets.xcassets/cancel.imageset/Delete-500.png new file mode 100644 index 0000000..e481485 Binary files /dev/null and b/Vendoo/Assets.xcassets/cancel.imageset/Delete-500.png differ diff --git a/Vendoo/Assets.xcassets/circle.imageset/Contents.json b/Vendoo/Assets.xcassets/circle.imageset/Contents.json new file mode 100644 index 0000000..01f9284 --- /dev/null +++ b/Vendoo/Assets.xcassets/circle.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "circle2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "circle3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/circle.imageset/circle2x.png b/Vendoo/Assets.xcassets/circle.imageset/circle2x.png new file mode 100644 index 0000000..1d111c4 Binary files /dev/null and b/Vendoo/Assets.xcassets/circle.imageset/circle2x.png differ diff --git a/Vendoo/Assets.xcassets/circle.imageset/circle3x.png b/Vendoo/Assets.xcassets/circle.imageset/circle3x.png new file mode 100644 index 0000000..cbd8ba5 Binary files /dev/null and b/Vendoo/Assets.xcassets/circle.imageset/circle3x.png differ diff --git a/Vendoo/Assets.xcassets/ebay_grey.imageset/Contents.json b/Vendoo/Assets.xcassets/ebay_grey.imageset/Contents.json new file mode 100644 index 0000000..a895cf6 --- /dev/null +++ b/Vendoo/Assets.xcassets/ebay_grey.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ebay_grey@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/ebay_grey.imageset/ebay_grey@2x.png b/Vendoo/Assets.xcassets/ebay_grey.imageset/ebay_grey@2x.png new file mode 100644 index 0000000..bafbede Binary files /dev/null and b/Vendoo/Assets.xcassets/ebay_grey.imageset/ebay_grey@2x.png differ diff --git a/Vendoo/Assets.xcassets/ebay_icon.imageset/Contents.json b/Vendoo/Assets.xcassets/ebay_icon.imageset/Contents.json old mode 100644 new mode 100755 index 48c7812..7a82f3c --- a/Vendoo/Assets.xcassets/ebay_icon.imageset/Contents.json +++ b/Vendoo/Assets.xcassets/ebay_icon.imageset/Contents.json @@ -6,7 +6,7 @@ }, { "idiom" : "universal", - "filename" : "ebay-icon.png", + "filename" : "ebay@2x.png", "scale" : "2x" }, { diff --git a/Vendoo/Assets.xcassets/ebay_icon.imageset/ebay-icon.png b/Vendoo/Assets.xcassets/ebay_icon.imageset/ebay-icon.png deleted file mode 100644 index bde82df..0000000 Binary files a/Vendoo/Assets.xcassets/ebay_icon.imageset/ebay-icon.png and /dev/null differ diff --git a/Vendoo/Assets.xcassets/ebay_icon.imageset/ebay@2x.png b/Vendoo/Assets.xcassets/ebay_icon.imageset/ebay@2x.png new file mode 100644 index 0000000..9a99978 Binary files /dev/null and b/Vendoo/Assets.xcassets/ebay_icon.imageset/ebay@2x.png differ diff --git a/Vendoo/Assets.xcassets/etsy_grey.imageset/Contents.json b/Vendoo/Assets.xcassets/etsy_grey.imageset/Contents.json new file mode 100644 index 0000000..02ac803 --- /dev/null +++ b/Vendoo/Assets.xcassets/etsy_grey.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Etsy_grey@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/etsy_grey.imageset/Etsy_grey@2x.png b/Vendoo/Assets.xcassets/etsy_grey.imageset/Etsy_grey@2x.png new file mode 100644 index 0000000..12c34a0 Binary files /dev/null and b/Vendoo/Assets.xcassets/etsy_grey.imageset/Etsy_grey@2x.png differ diff --git a/Vendoo/Assets.xcassets/etsy_icon.imageset/Contents.json b/Vendoo/Assets.xcassets/etsy_icon.imageset/Contents.json old mode 100644 new mode 100755 index 5e1ca0a..7d0e42b --- a/Vendoo/Assets.xcassets/etsy_icon.imageset/Contents.json +++ b/Vendoo/Assets.xcassets/etsy_icon.imageset/Contents.json @@ -6,7 +6,7 @@ }, { "idiom" : "universal", - "filename" : "Etsy-icon.png", + "filename" : "Etsy@2x.png", "scale" : "2x" }, { diff --git a/Vendoo/Assets.xcassets/etsy_icon.imageset/Etsy-icon.png b/Vendoo/Assets.xcassets/etsy_icon.imageset/Etsy-icon.png deleted file mode 100644 index a744b41..0000000 Binary files a/Vendoo/Assets.xcassets/etsy_icon.imageset/Etsy-icon.png and /dev/null differ diff --git a/Vendoo/Assets.xcassets/etsy_icon.imageset/Etsy@2x.png b/Vendoo/Assets.xcassets/etsy_icon.imageset/Etsy@2x.png new file mode 100644 index 0000000..024aa34 Binary files /dev/null and b/Vendoo/Assets.xcassets/etsy_icon.imageset/Etsy@2x.png differ diff --git a/Vendoo/Assets.xcassets/facebook_grey.imageset/Contents.json b/Vendoo/Assets.xcassets/facebook_grey.imageset/Contents.json new file mode 100644 index 0000000..92e93f4 --- /dev/null +++ b/Vendoo/Assets.xcassets/facebook_grey.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Facebook_grey@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/facebook_icon.imageset/facebook-icon-small-1.png b/Vendoo/Assets.xcassets/facebook_grey.imageset/Facebook_grey@2x.png similarity index 72% rename from Vendoo/Assets.xcassets/facebook_icon.imageset/facebook-icon-small-1.png rename to Vendoo/Assets.xcassets/facebook_grey.imageset/Facebook_grey@2x.png index 003e66e..e3f6928 100644 Binary files a/Vendoo/Assets.xcassets/facebook_icon.imageset/facebook-icon-small-1.png and b/Vendoo/Assets.xcassets/facebook_grey.imageset/Facebook_grey@2x.png differ diff --git a/Vendoo/Assets.xcassets/facebook_icon.imageset/Contents.json b/Vendoo/Assets.xcassets/facebook_icon.imageset/Contents.json old mode 100644 new mode 100755 index 6aaf7e7..34b3288 --- a/Vendoo/Assets.xcassets/facebook_icon.imageset/Contents.json +++ b/Vendoo/Assets.xcassets/facebook_icon.imageset/Contents.json @@ -6,7 +6,7 @@ }, { "idiom" : "universal", - "filename" : "facebook-icon-small-1.png", + "filename" : "Facebook@2x.png", "scale" : "2x" }, { diff --git a/Vendoo/Assets.xcassets/facebook_icon.imageset/Facebook@2x.png b/Vendoo/Assets.xcassets/facebook_icon.imageset/Facebook@2x.png new file mode 100644 index 0000000..b2f5bd1 Binary files /dev/null and b/Vendoo/Assets.xcassets/facebook_icon.imageset/Facebook@2x.png differ diff --git a/Vendoo/Assets.xcassets/faq.imageset/Contents.json b/Vendoo/Assets.xcassets/faq.imageset/Contents.json new file mode 100644 index 0000000..7d2e0a7 --- /dev/null +++ b/Vendoo/Assets.xcassets/faq.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "faq.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/faq.imageset/faq.png b/Vendoo/Assets.xcassets/faq.imageset/faq.png new file mode 100644 index 0000000..6a51f2e Binary files /dev/null and b/Vendoo/Assets.xcassets/faq.imageset/faq.png differ diff --git a/Vendoo/Assets.xcassets/first.imageset/Contents.json b/Vendoo/Assets.xcassets/first.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Vendoo/Assets.xcassets/first.imageset/first.pdf b/Vendoo/Assets.xcassets/first.imageset/first.pdf old mode 100644 new mode 100755 diff --git a/Vendoo/Assets.xcassets/items.imageset/Contents.json b/Vendoo/Assets.xcassets/items.imageset/Contents.json new file mode 100644 index 0000000..d7b848e --- /dev/null +++ b/Vendoo/Assets.xcassets/items.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Items@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/items.imageset/Items@2x.png b/Vendoo/Assets.xcassets/items.imageset/Items@2x.png new file mode 100644 index 0000000..a469c88 Binary files /dev/null and b/Vendoo/Assets.xcassets/items.imageset/Items@2x.png differ diff --git a/Vendoo/Assets.xcassets/marketplaces.imageset/Contents.json b/Vendoo/Assets.xcassets/marketplaces.imageset/Contents.json new file mode 100644 index 0000000..6f603f6 --- /dev/null +++ b/Vendoo/Assets.xcassets/marketplaces.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "marketplaces@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/marketplaces.imageset/marketplaces@2x.png b/Vendoo/Assets.xcassets/marketplaces.imageset/marketplaces@2x.png new file mode 100644 index 0000000..0812769 Binary files /dev/null and b/Vendoo/Assets.xcassets/marketplaces.imageset/marketplaces@2x.png differ diff --git a/Vendoo/Assets.xcassets/menu.imageset/Contents.json b/Vendoo/Assets.xcassets/menu.imageset/Contents.json new file mode 100644 index 0000000..a97594f --- /dev/null +++ b/Vendoo/Assets.xcassets/menu.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Hamburger button@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/menu.imageset/Hamburger button@2x.png b/Vendoo/Assets.xcassets/menu.imageset/Hamburger button@2x.png new file mode 100644 index 0000000..0c66279 Binary files /dev/null and b/Vendoo/Assets.xcassets/menu.imageset/Hamburger button@2x.png differ diff --git a/Vendoo/Assets.xcassets/sales.imageset/Contents.json b/Vendoo/Assets.xcassets/sales.imageset/Contents.json new file mode 100644 index 0000000..898119e --- /dev/null +++ b/Vendoo/Assets.xcassets/sales.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Dollar@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/sales.imageset/Dollar@2x.png b/Vendoo/Assets.xcassets/sales.imageset/Dollar@2x.png new file mode 100644 index 0000000..fdd7a66 Binary files /dev/null and b/Vendoo/Assets.xcassets/sales.imageset/Dollar@2x.png differ diff --git a/Vendoo/Assets.xcassets/second.imageset/Contents.json b/Vendoo/Assets.xcassets/second.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Vendoo/Assets.xcassets/second.imageset/second.pdf b/Vendoo/Assets.xcassets/second.imageset/second.pdf old mode 100644 new mode 100755 diff --git a/Vendoo/Assets.xcassets/settings.imageset/Contents.json b/Vendoo/Assets.xcassets/settings.imageset/Contents.json new file mode 100644 index 0000000..dd64620 --- /dev/null +++ b/Vendoo/Assets.xcassets/settings.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Settings@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/Assets.xcassets/settings.imageset/Settings@2x.png b/Vendoo/Assets.xcassets/settings.imageset/Settings@2x.png new file mode 100644 index 0000000..34ab76f Binary files /dev/null and b/Vendoo/Assets.xcassets/settings.imageset/Settings@2x.png differ diff --git a/Vendoo/Assets.xcassets/start.imageset/About-100.png b/Vendoo/Assets.xcassets/start.imageset/About-100.png new file mode 100644 index 0000000..352a4d0 Binary files /dev/null and b/Vendoo/Assets.xcassets/start.imageset/About-100.png differ diff --git a/Vendoo/Assets.xcassets/start.imageset/About-500.png b/Vendoo/Assets.xcassets/start.imageset/About-500.png new file mode 100644 index 0000000..6a4cfa1 Binary files /dev/null and b/Vendoo/Assets.xcassets/start.imageset/About-500.png differ diff --git a/Vendoo/Assets.xcassets/start.imageset/Contents.json b/Vendoo/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..29db8e5 --- /dev/null +++ b/Vendoo/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "About-100.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "About-500.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Vendoo/EbaySettingsViewController.swift b/Vendoo/EbaySettingsViewController.swift new file mode 100644 index 0000000..c40945b --- /dev/null +++ b/Vendoo/EbaySettingsViewController.swift @@ -0,0 +1,47 @@ +// +// EbaySettingsViewController.swift +// Vendoo +// +// Created by Okechi Onyeje on 6/29/16. +// Copyright © 2016 Okechi Onyeje. All rights reserved. +// + +import UIKit + +class EbaySettingsViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + + /* + // 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. + } + */ + +} + + +//MARK:- IBActions +extension EbaySettingsViewController { + + @IBAction func navigateBack(sender: AnyObject){ + + self.dismissViewControllerAnimated(true, completion: nil) + + } + +} \ No newline at end of file diff --git a/Vendoo/EtsySettingsViewController.swift b/Vendoo/EtsySettingsViewController.swift new file mode 100644 index 0000000..73d5684 --- /dev/null +++ b/Vendoo/EtsySettingsViewController.swift @@ -0,0 +1,46 @@ +// +// EtsySettingsViewController.swift +// Vendoo +// +// Created by Okechi Onyeje on 6/29/16. +// Copyright © 2016 Okechi Onyeje. All rights reserved. +// + +import UIKit + +class EtsySettingsViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + + /* + // 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. + } + */ + +} + +//MARK:- IBActions +extension EtsySettingsViewController { + + @IBAction func navigateBack(sender: AnyObject){ + + self.dismissViewControllerAnimated(true, completion: nil) + + } + +} \ No newline at end of file diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard old mode 100644 new mode 100755 index 8ee1358..161b594 --- a/Vendoo/Main.storyboard +++ b/Vendoo/Main.storyboard @@ -13,29 +13,22 @@ - - + - + - - + @@ -137,7 +139,7 @@ - + @@ -150,7 +152,7 @@ - + @@ -160,29 +162,22 @@ - - + - + - - + + + + + + @@ -226,7 +232,7 @@ - + @@ -257,9 +263,9 @@ - + - + @@ -268,11 +274,11 @@ - @@ -417,7 +469,7 @@ - + @@ -452,7 +504,7 @@ - + @@ -487,7 +539,7 @@ - + @@ -522,7 +574,7 @@ - + @@ -550,6 +602,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -562,16 +668,16 @@ + + + + + + + + + + + + + + + + + + @@ -619,12 +790,32 @@ - + + + + + + + + + + + + + + + + + + + + + - + @@ -638,14 +829,14 @@ - + @@ -659,21 +850,35 @@ + + + + + + + + - + @@ -687,7 +892,7 @@ - + @@ -701,14 +906,14 @@ - + @@ -781,17 +986,10 @@ - + @@ -827,7 +1032,75 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -842,7 +1115,8 @@ - + + @@ -863,18 +1137,41 @@ - + + + - + @@ -891,7 +1188,7 @@ - + @@ -907,7 +1204,7 @@ - + @@ -922,7 +1219,7 @@ - + @@ -937,7 +1234,7 @@ - + @@ -947,29 +1244,6 @@ - - @@ -982,20 +1256,22 @@ - + - - + - + + + + @@ -1006,7 +1282,7 @@ - + @@ -1027,7 +1303,7 @@ - + @@ -1037,15 +1313,8 @@ - - + @@ -1072,6 +1341,13 @@ + @@ -1083,12 +1359,23 @@ + + + + + @@ -1103,12 +1390,16 @@ + + + + @@ -1123,12 +1414,16 @@ + + + + @@ -1140,12 +1435,16 @@ + + + + @@ -1157,19 +1456,23 @@ + + + + - @@ -1190,7 +1492,7 @@ - + @@ -1207,7 +1509,7 @@ - + @@ -1223,7 +1525,7 @@ - + @@ -1240,7 +1542,7 @@ - + @@ -1268,7 +1570,7 @@ - + @@ -1285,7 +1587,7 @@ - + @@ -1301,7 +1603,7 @@ - + @@ -1318,7 +1620,7 @@ - + @@ -1354,7 +1656,7 @@ - + @@ -1369,7 +1671,8 @@ - + + @@ -1389,7 +1692,7 @@ - + @@ -1407,14 +1710,36 @@ - - + + + + + @@ -1424,7 +1749,7 @@ - + @@ -1442,14 +1767,36 @@ - - + + + + + @@ -1459,7 +1806,7 @@ - + @@ -1477,14 +1824,36 @@ - - + + + + + @@ -1494,7 +1863,7 @@ - + @@ -1512,14 +1881,33 @@ - - + + + + + @@ -1527,7 +1915,9 @@ - + + + @@ -1537,35 +1927,800 @@ - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + - + - + diff --git a/Vendoo/NetworkTableViewCell.swift b/Vendoo/NetworkTableViewCell.swift index 9044f25..bbdc5fb 100644 --- a/Vendoo/NetworkTableViewCell.swift +++ b/Vendoo/NetworkTableViewCell.swift @@ -10,7 +10,9 @@ import UIKit class EbayTableViewCell: UITableViewCell { @IBOutlet weak var networkToggle: UISwitch! - + @IBOutlet weak var authorizeBtn: UIButton! + @IBOutlet weak var settingsBtn: UIButton! + override func awakeFromNib() { super.awakeFromNib() @@ -27,6 +29,10 @@ class EbayTableViewCell: UITableViewCell { class AmazonTableViewCell: UITableViewCell { @IBOutlet weak var networkToggle: UISwitch! + @IBOutlet weak var authorizeBtn: UIButton! + @IBOutlet weak var settingsBtn: UIButton! + + override func awakeFromNib() { super.awakeFromNib() @@ -43,6 +49,9 @@ class AmazonTableViewCell: UITableViewCell { class EtsyTableViewCell: UITableViewCell { @IBOutlet weak var networkToggle: UISwitch! + @IBOutlet weak var authorizeBtn: UIButton! + @IBOutlet weak var settingsBtn: UIButton! + override func awakeFromNib() { super.awakeFromNib() @@ -59,6 +68,10 @@ class EtsyTableViewCell: UITableViewCell { class FBTableViewCell: UITableViewCell { @IBOutlet weak var networkToggle: UISwitch! + @IBOutlet weak var authorizeBtn: UIButton! + @IBOutlet weak var settingsBtn: UIButton! + + override func awakeFromNib() { super.awakeFromNib() diff --git a/Vendoo/NetworksTableViewController.swift b/Vendoo/NetworksTableViewController.swift index 6a1e496..350328e 100644 --- a/Vendoo/NetworksTableViewController.swift +++ b/Vendoo/NetworksTableViewController.swift @@ -162,8 +162,14 @@ extension NetworksTableViewController: UITableViewDataSource { cell = (self.tableView.dequeueReusableCellWithIdentifier("ebay", forIndexPath: indexPath) as! EbayTableViewCell) if(((self.tabBarController as? HomeViewController)?.ebayGraphManager.isAuthorized)!){ - - (cell as! EbayTableViewCell).networkToggle.setOn(true, animated: false) + dispatch_async(dispatch_get_main_queue(), { + (cell as! EbayTableViewCell).authorizeBtn.setTitle("Logout", forState: UIControlState.Normal) + + }) + //(cell as! EbayTableViewCell).networkToggle.setOn(true, animated: false) + }else{ + (cell as! EbayTableViewCell).settingsBtn.enabled = false + (cell as! EbayTableViewCell).settingsBtn.hidden = true } break @@ -177,8 +183,15 @@ extension NetworksTableViewController: UITableViewDataSource { let tabBar = self.tabBarController if(((tabBar as? HomeViewController)?.etsyManager.isAuthorized)!){ + dispatch_async(dispatch_get_main_queue(), { + (cell as! EtsyTableViewCell).authorizeBtn.setTitle("Logout", forState: UIControlState.Normal) + + //(cell as! EtsyTableViewCell).networkToggle.setOn(true, animated: false) + }) - (cell as! EtsyTableViewCell).networkToggle.setOn(true, animated: false) + }else{ + (cell as! EtsyTableViewCell).settingsBtn.enabled = false + (cell as! EtsyTableViewCell).settingsBtn.hidden = true } break default: @@ -187,8 +200,15 @@ extension NetworksTableViewController: UITableViewDataSource { let tabBar = self.tabBarController if(((tabBar as? HomeViewController)?.fbGraphManager.isAuthorized)!){ - - (cell as! FBTableViewCell).networkToggle.setOn(true, animated: false) + dispatch_async(dispatch_get_main_queue(), { + (cell as! FBTableViewCell).authorizeBtn.setTitle("Logout", forState: UIControlState.Normal) + }) + //(cell as! FBTableViewCell).networkToggle.setOn(true, animated: false) + }else{ + dispatch_async(dispatch_get_main_queue(), { + (cell as! FBTableViewCell).settingsBtn.enabled = false + (cell as! FBTableViewCell).settingsBtn.hidden = true + }) } break @@ -694,4 +714,71 @@ extension NetworksTableViewController: UIWebViewDelegate { } +} + +extension NetworksTableViewController { + @IBAction func toggleAuth(sender: UIButton){ + print(sender.superview!.superview!.classForCoder) + + //Authorize app + if(sender.titleLabel?.text == "Login") { + switch (sender.superview?.superview?.classForCoder){ + case is EbayTableViewCell.Type: + let tabBar = self.tabBarController + ((tabBar as? HomeViewController)?.ebayGraphManager.authorizeApp())! + dispatch_async(dispatch_get_main_queue(), { + sender.setTitle("Logout", forState: UIControlState.Normal) + (sender.superview?.superview as! EbayTableViewCell).settingsBtn.enabled = true + (sender.superview?.superview as! EbayTableViewCell).settingsBtn.hidden = false + }) + break + case is AmazonTableViewCell.Type: + break + case is EtsyTableViewCell.Type: + let tabBar = self.tabBarController + ((tabBar as? HomeViewController)?.etsyManager.authorizeApp(self))! + dispatch_async(dispatch_get_main_queue(), { + sender.setTitle("Logout", forState: UIControlState.Normal) + (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.enabled = true + (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.hidden = false + }) + break + case is FBTableViewCell.Type: + break + default: + break + } + } + //DeAuthorize app + else { + switch (sender.superview?.superview?.classForCoder){ + case is EbayTableViewCell.Type: + let tabBar = self.tabBarController + ((tabBar as? HomeViewController)?.ebayGraphManager.deauthorizeApp())! + dispatch_async(dispatch_get_main_queue(), { + sender.setTitle("Login", forState: UIControlState.Normal) + (sender.superview?.superview as! EbayTableViewCell).settingsBtn.enabled = false + (sender.superview?.superview as! EbayTableViewCell).settingsBtn.hidden = true + + }) + break + case is AmazonTableViewCell.Type: + break + case is EtsyTableViewCell.Type: + let tabBar = self.tabBarController + ((tabBar as? HomeViewController)?.etsyManager.deAuthorizeApp(self))! + dispatch_async(dispatch_get_main_queue(), { + sender.setTitle("Login", forState: UIControlState.Normal) + (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.enabled = false + (sender.superview?.superview as! EtsyTableViewCell).settingsBtn.hidden = true + }) + break + case is FBTableViewCell.Type: + break + default: + break + } + } + + } } \ No newline at end of file