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

Merged branch Comment-Out-Amazon-From-Showing-In-App into master

Browse Source
This commit is contained in:
Okechi Onyeje 2016-12-29 10:46:58 -05:00
commit 7ce7e7328d
3 changed files with 15 additions and 16 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.

10
Vendoo/Main.storyboard
View File

@ -1564,7 +1564,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <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"> <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="72" width="375" height="69"/> <rect key="frame" x="0.0" y="28" width="375" height="69"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9G8-XI-ptI" id="r3f-6Q-p1g"> <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"/> <rect key="frame" x="0.0" y="0.0" width="375" height="68.5"/>
@ -1640,7 +1640,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Change_Pass_Cell" id="ceq-sl-ClT"> <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="72" width="375" height="44"/> <rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ceq-sl-ClT" id="Waq-fu-UxD"> <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"/> <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@ -1657,7 +1657,7 @@
</tableViewCellContentView> </tableViewCellContentView>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Delete_Account_Cell" id="Lha-cf-Sfc"> <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="116" width="375" height="44"/> <rect key="frame" x="0.0" y="72" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Lha-cf-Sfc" id="kmF-Sb-d0c"> <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"/> <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@ -2415,12 +2415,12 @@
<image name="start" width="50" height="50"/> <image name="start" width="50" height="50"/>
</resources> </resources>
<inferredMetricsTieBreakers> <inferredMetricsTieBreakers>
<segue reference="vCG-jU-HYF"/>
<segue reference="syc-IR-LNQ"/> <segue reference="syc-IR-LNQ"/>
<segue reference="nWA-7e-2Ec"/> <segue reference="nWA-7e-2Ec"/>
<segue reference="NOz-ya-avj"/> <segue reference="KKl-Gj-ZVc"/>
<segue reference="rkZ-c8-XJc"/> <segue reference="rkZ-c8-XJc"/>
<segue reference="Ogu-p5-UtK"/> <segue reference="Ogu-p5-UtK"/>
<segue reference="KKl-Gj-ZVc"/>
</inferredMetricsTieBreakers> </inferredMetricsTieBreakers>
<color key="tintColor" red="0.2784313725" green="0.80392156859999997" blue="0.68235294120000001" alpha="1" colorSpace="calibratedRGB"/> <color key="tintColor" red="0.2784313725" green="0.80392156859999997" blue="0.68235294120000001" alpha="1" colorSpace="calibratedRGB"/>
</document> </document>

21
Vendoo/NetworksTableViewController.swift
View File

@ -221,7 +221,7 @@ extension NetworksTableViewController: UITableViewDataSource {
return count return count
} }
else { else {
return 4 return /*4*/ 3
} }
} }
@ -275,11 +275,11 @@ extension NetworksTableViewController: UITableViewDataSource {
} }
break break
case 1: /*case 1:
//loads network cell for amazon //loads network cell for amazon
cell = (self.tableView.dequeueReusableCellWithIdentifier("amazon", forIndexPath: indexPath) as! AmazonTableViewCell) cell = (self.tableView.dequeueReusableCellWithIdentifier("amazon", forIndexPath: indexPath) as! AmazonTableViewCell)
break break*/
case 2: case 1:
//loads network cell for etsy //loads network cell for etsy
cell = (self.tableView.dequeueReusableCellWithIdentifier("etsy", forIndexPath: indexPath) as! EtsyTableViewCell) cell = (self.tableView.dequeueReusableCellWithIdentifier("etsy", forIndexPath: indexPath) as! EtsyTableViewCell)
@ -563,7 +563,6 @@ extension NetworksTableViewController: UITableViewDelegate {
} }
else{}
} }
@ -646,8 +645,8 @@ extension NetworksTableViewController {
}))! }))!
break break
case is AmazonTableViewCell.Type: /*case is AmazonTableViewCell.Type:
break break*/
case is EtsyTableViewCell.Type: case is EtsyTableViewCell.Type:
let tabBar = self.tabBarController let tabBar = self.tabBarController
((tabBar as? HomeViewController)?.etsyManager.authorizeApp(self, onComplete: { ((tabBar as? HomeViewController)?.etsyManager.authorizeApp(self, onComplete: {
@ -693,8 +692,8 @@ extension NetworksTableViewController {
}) })
break break
case is AmazonTableViewCell.Type: /*case is AmazonTableViewCell.Type:
break break*/
case is EtsyTableViewCell.Type: case is EtsyTableViewCell.Type:
let tabBar = self.tabBarController let tabBar = self.tabBarController
((tabBar as? HomeViewController)?.etsyManager.deAuthorizeApp(self))! ((tabBar as? HomeViewController)?.etsyManager.deAuthorizeApp(self))!
@ -739,7 +738,7 @@ extension NetworksTableViewController {
} }
break break
case is AmazonTableViewCell.Type: /*case is AmazonTableViewCell.Type:
//selection code for amazon //selection code for amazon
if((sender.superview?.superview as! AmazonTableViewCell).networkToggle.on){ if((sender.superview?.superview as! AmazonTableViewCell).networkToggle.on){
@ -753,7 +752,7 @@ extension NetworksTableViewController {
self.networksDictionary["amazon"] = false self.networksDictionary["amazon"] = false
} }
break break*/
case is EtsyTableViewCell.Type: case is EtsyTableViewCell.Type:
//selection code for etsy //selection code for etsy
if((sender.superview?.superview as! EtsyTableViewCell).networkToggle.on){ if((sender.superview?.superview as! EtsyTableViewCell).networkToggle.on){