From c23641af56174516103a83c5ad11a9148821aba4 Mon Sep 17 00:00:00 2001 From: Okechi Onyeje Date: Sat, 19 Nov 2016 19:08:48 -0500 Subject: [PATCH] Dynamic Collection Views Implemented --- Vendoo.xcodeproj/project.pbxproj | 4 + .../UserInterfaceState.xcuserstate | Bin 33969 -> 34572 bytes .../xcdebugger/Breakpoints_v2.xcbkptlist | 137 +++++++++++++++++- Vendoo/ItemCell.swift | 15 +- Vendoo/ItemTableViewController.swift | 68 +++++---- Vendoo/ListingPreviewViewController.swift | 16 +- Vendoo/Main.storyboard | 107 ++------------ Vendoo/NetworkCollectionViewCell.swift | 18 +++ 8 files changed, 228 insertions(+), 137 deletions(-) create mode 100644 Vendoo/NetworkCollectionViewCell.swift diff --git a/Vendoo.xcodeproj/project.pbxproj b/Vendoo.xcodeproj/project.pbxproj index e5b1b72..5f0cc46 100644 --- a/Vendoo.xcodeproj/project.pbxproj +++ b/Vendoo.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 3E7CF4011CF6366300F486B2 /* EtsyRESTAPIManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7CF4001CF6366300F486B2 /* EtsyRESTAPIManager.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 */; }; 3EC325111CF703A600626C48 /* ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC325101CF703A600626C48 /* ItemCell.swift */; }; 3EC325151CF7104300626C48 /* ItemTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC325141CF7104300626C48 /* ItemTableViewController.swift */; }; 3EC3251E1CF734C100626C48 /* NetworksTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC3251D1CF734C100626C48 /* NetworksTableViewController.swift */; }; @@ -99,6 +100,7 @@ 3EA668A01D02836C00EE57A8 /* EbayWebServiceManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EbayWebServiceManager.swift; sourceTree = ""; }; 3EA668A21D02ECB100EE57A8 /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; }; 3EB2F5151CF442CF002E6D2C /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 3EB54E0D1DE08A2E006D918B /* NetworkCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkCollectionViewCell.swift; sourceTree = ""; }; 3EC325101CF703A600626C48 /* ItemCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemCell.swift; sourceTree = ""; }; 3EC325141CF7104300626C48 /* ItemTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemTableViewController.swift; sourceTree = ""; }; 3EC3251D1CF734C100626C48 /* NetworksTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworksTableViewController.swift; sourceTree = ""; }; @@ -288,6 +290,7 @@ 3EC325101CF703A600626C48 /* ItemCell.swift */, 3EC325141CF7104300626C48 /* ItemTableViewController.swift */, 3E0F76FB1D01B2D7004A0159 /* Listing.swift */, + 3EB54E0D1DE08A2E006D918B /* NetworkCollectionViewCell.swift */, ); name = Items; sourceTree = ""; @@ -763,6 +766,7 @@ 3E1AA4321D0DA071005FCCBB /* MenuPanelViewController.swift in Sources */, 3E4897D11D0067030069F742 /* FirebaseManager.swift in Sources */, 3E1AA4351D0DD173005FCCBB /* SettingsViewController.swift in Sources */, + 3EB54E0E1DE08A2E006D918B /* NetworkCollectionViewCell.swift in Sources */, 3E0F76FC1D01B2D7004A0159 /* Listing.swift in Sources */, 3E6CC3571CF2A94B00E00A70 /* AppDelegate.swift in Sources */, 3EC3251E1CF734C100626C48 /* NetworksTableViewController.swift in Sources */, diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index 64d589ca0af1944637d5a44b40fad633093dad9a..25d4c59666f3df942ff1daa36fc96657e8de017e 100644 GIT binary patch delta 17853 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 G^8XL!wj724 delta 17362 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 @@ -186,7 +186,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift" - timestampString = "500945316.10311" + timestampString = "501291173.047822" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "570" @@ -201,7 +201,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift" - timestampString = "500945316.10327" + timestampString = "501291173.047982" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "572" @@ -543,6 +543,53 @@ endingLineNumber = "625" landmarkName = "getListingInfo(_:onCompletion:)" landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Vendoo/ItemCell.swift b/Vendoo/ItemCell.swift index fa7759f..ad23d4c 100644 --- a/Vendoo/ItemCell.swift +++ b/Vendoo/ItemCell.swift @@ -20,6 +20,7 @@ class ItemCell: UITableViewCell, UICollectionViewDelegate { @IBOutlet weak var itemStatus: UILabel! @IBOutlet weak var itemPrice: UILabel! @IBOutlet weak var networks: UICollectionView! + var selectedNetworks: [String] = [] override func awakeFromNib() { @@ -36,6 +37,10 @@ class ItemCell: UITableViewCell, UICollectionViewDelegate { // Configure the view for the selected state } + func addNetwork(network: String){ + self.selectedNetworks.append(network) + } + } @@ -51,14 +56,14 @@ extension ItemCell: UICollectionViewDataSource{ func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { // #warning Incomplete implementation, return the number of items - return 4 + return selectedNetworks.count } func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell { - let cell: UICollectionViewCell! - - switch (indexPath.row){ + let cell: NetworkCollectionViewCell! = self.networks.dequeueReusableCellWithReuseIdentifier("network", forIndexPath: indexPath) as! NetworkCollectionViewCell + cell.setImg(selectedNetworks[indexPath.row]) + /*switch (indexPath.row){ case 0: cell = collectionView.dequeueReusableCellWithReuseIdentifier("ebay", forIndexPath: indexPath) break @@ -71,7 +76,7 @@ extension ItemCell: UICollectionViewDataSource{ default: cell = collectionView.dequeueReusableCellWithReuseIdentifier("facebook", forIndexPath: indexPath) break - } + }*/ // Configure the cell (in this case show or hide the cell depending on which network the item is being listed on) diff --git a/Vendoo/ItemTableViewController.swift b/Vendoo/ItemTableViewController.swift index ff66e52..7dae7af 100644 --- a/Vendoo/ItemTableViewController.swift +++ b/Vendoo/ItemTableViewController.swift @@ -178,20 +178,26 @@ extension ItemTableViewController: UITableViewDataSource{ if(!((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["areNetworksChosen"])!){ cell.networks.hidden = true }else{ + cell.selectedNetworks = [] dispatch_async(dispatch_get_main_queue(), { - if(!((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["ebay"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 0, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["ebay"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 0, inSection: 0))?.hidden = true + cell.addNetwork("ebay_icon") } - if(!((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["amazon"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 1, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["amazon"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 1, inSection: 0))?.hidden = true + cell.addNetwork("amazon_icon") } - if(!((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["etsy"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 2, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["etsy"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 2, inSection: 0))?.hidden = true + cell.addNetwork("etsy_icon") } - if(!((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["facebook"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 3, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.userListings[indexPath.row].networks["facebook"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 3, inSection: 0))?.hidden = true + cell.addNetwork("facebook_icon") } + cell.networks.reloadData() }) @@ -208,21 +214,26 @@ extension ItemTableViewController: UITableViewDataSource{ if(!((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["areNetworksChosen"])!){ cell.networks.hidden = true }else{ + cell.selectedNetworks = [] dispatch_async(dispatch_get_main_queue(), { - if(!((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["ebay"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 0, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["ebay"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 0, inSection: 0))?.hidden = true + cell.addNetwork("ebay_icon") } - if(!((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["amazon"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 1, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["amazon"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 1, inSection: 0))?.hidden = true + cell.addNetwork("amazon_icon") } - if(!((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["etsy"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 2, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["etsy"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 2, inSection: 0))?.hidden = true + cell.addNetwork("etsy_icon") } - if(!((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["facebook"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 3, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["facebook"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 3, inSection: 0))?.hidden = true + cell.addNetwork("facebook_icon") } - + cell.networks.reloadData() }) } @@ -238,21 +249,26 @@ extension ItemTableViewController: UITableViewDataSource{ if(!((self.tabBarController as? HomeViewController)!.soldListings[indexPath.row].networks["areNetworksChosen"])!){ cell.networks.hidden = true }else{ + cell.selectedNetworks = [] dispatch_async(dispatch_get_main_queue(), { - if(!((self.tabBarController as? HomeViewController)!.soldListings[indexPath.row].networks["ebay"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 0, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["ebay"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 0, inSection: 0))?.hidden = true + cell.addNetwork("ebay_icon") } - if(!((self.tabBarController as? HomeViewController)!.soldListings[indexPath.row].networks["amazon"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 1, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["amazon"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 1, inSection: 0))?.hidden = true + cell.addNetwork("amazon_icon") } - if(!((self.tabBarController as? HomeViewController)!.soldListings[indexPath.row].networks["etsy"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 2, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["etsy"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 2, inSection: 0))?.hidden = true + cell.addNetwork("etsy_icon") } - if(!((self.tabBarController as? HomeViewController)!.soldListings[indexPath.row].networks["facebook"])!){ - cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 3, inSection: 0))?.hidden = true + if(((self.tabBarController as? HomeViewController)!.endedListings[indexPath.row].networks["facebook"])!){ + //cell.networks.cellForItemAtIndexPath(NSIndexPath(forRow: 3, inSection: 0))?.hidden = true + cell.addNetwork("facebook_icon") } - + cell.networks.reloadData() }) } diff --git a/Vendoo/ListingPreviewViewController.swift b/Vendoo/ListingPreviewViewController.swift index eaa9ac5..6eef20b 100644 --- a/Vendoo/ListingPreviewViewController.swift +++ b/Vendoo/ListingPreviewViewController.swift @@ -49,6 +49,7 @@ class ListingPreviewViewController: UIViewController { private var newInProgressListing: Dictionary = Dictionary() var loadingView: UIView! private var itemViewState = "" + private var selectedNetworks : [String] = [] override func viewDidLoad() { super.viewDidLoad() @@ -126,6 +127,11 @@ class ListingPreviewViewController: UIViewController { func setDictionary(netdictionary:Dictionary, itemdictionary: Dictionary){ self.networksDictionary = netdictionary + for (k,v) in self.networksDictionary { + if ((k != "areNetworksChosen") && v) { + self.selectedNetworks.append("\(k)_icon") + } + } self.itemListingDictionary = itemdictionary } @@ -785,14 +791,14 @@ extension ListingPreviewViewController: UICollectionViewDataSource { func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { // #warning Incomplete implementation, return the number of items - return 4 + return self.selectedNetworks.count } func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell { - let cell: UICollectionViewCell! - - switch (indexPath.row){ + let cell: NetworkCollectionViewCell! = self.networks.dequeueReusableCellWithReuseIdentifier("network", forIndexPath: indexPath) as! NetworkCollectionViewCell + cell.setImg(selectedNetworks[indexPath.row]) + /*switch (indexPath.row){ case 0: cell = collectionView.dequeueReusableCellWithReuseIdentifier("ebay", forIndexPath: indexPath) @@ -834,7 +840,7 @@ extension ListingPreviewViewController: UICollectionViewDataSource { cell.hidden = false } break - } + }*/ return cell diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard index b105bf2..721f882 100755 --- a/Vendoo/Main.storyboard +++ b/Vendoo/Main.storyboard @@ -960,14 +960,14 @@ - + - + @@ -975,51 +975,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1312,66 +1270,23 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/Vendoo/NetworkCollectionViewCell.swift b/Vendoo/NetworkCollectionViewCell.swift new file mode 100644 index 0000000..f49c042 --- /dev/null +++ b/Vendoo/NetworkCollectionViewCell.swift @@ -0,0 +1,18 @@ +// +// NetworkCollectionViewCell.swift +// Vendoo +// +// Created by Okechi Onyeje on 11/19/16. +// Copyright © 2016 Okechi Onyeje. All rights reserved. +// + +import UIKit + +class NetworkCollectionViewCell: UICollectionViewCell { + @IBOutlet weak var image: UIImageView! + + func setImg(networkIcon: String!){ + + self.image.image = UIImage(named: networkIcon) + } +}