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 RDB-Add-Loading-Screens into Rapid-Dev-Branch

Browse Source
This commit is contained in:
Okechi Onyeje 2016-08-30 14:24:51 -04:00
commit 19ba3b178a
6 changed files with 91 additions and 61 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.

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

@ -26,11 +26,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494254840.86529" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "72" startingLineNumber = "73"
endingLineNumber = "72" endingLineNumber = "73"
landmarkName = "setListing()" landmarkName = "setListing()"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@ -42,11 +42,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "585" startingLineNumber = "605"
endingLineNumber = "585" endingLineNumber = "605"
landmarkName = "ListingPreviewViewController" landmarkName = "ListingPreviewViewController"
landmarkType = "3"> landmarkType = "3">
</BreakpointContent> </BreakpointContent>
@ -58,11 +58,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "626" startingLineNumber = "646"
endingLineNumber = "626" endingLineNumber = "646"
landmarkName = "collectionView(_:cellForItemAtIndexPath:)" landmarkName = "collectionView(_:cellForItemAtIndexPath:)"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@ -74,11 +74,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "597" startingLineNumber = "617"
endingLineNumber = "597" endingLineNumber = "617"
landmarkName = "ListingPreviewViewController" landmarkName = "ListingPreviewViewController"
landmarkType = "3"> landmarkType = "3">
</BreakpointContent> </BreakpointContent>
@ -90,11 +90,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "718" startingLineNumber = "738"
endingLineNumber = "718"> endingLineNumber = "738">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@ -104,11 +104,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "613" startingLineNumber = "633"
endingLineNumber = "613" endingLineNumber = "633"
landmarkName = "collectionView(_:cellForItemAtIndexPath:)" landmarkName = "collectionView(_:cellForItemAtIndexPath:)"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@ -120,11 +120,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "696" startingLineNumber = "716"
endingLineNumber = "696"> endingLineNumber = "716">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@ -150,11 +150,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "661" startingLineNumber = "681"
endingLineNumber = "661" endingLineNumber = "681"
landmarkName = "ListingPreviewViewController" landmarkName = "ListingPreviewViewController"
landmarkType = "3"> landmarkType = "3">
</BreakpointContent> </BreakpointContent>
@ -182,11 +182,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494254840.86529" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "476" startingLineNumber = "486"
endingLineNumber = "476" endingLineNumber = "486"
landmarkName = "publishItem(_:)" landmarkName = "publishItem(_:)"
landmarkType = "5"> landmarkType = "5">
<Locations> <Locations>
@ -230,11 +230,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494254840.86529" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "494" startingLineNumber = "504"
endingLineNumber = "494" endingLineNumber = "504"
landmarkName = "publishItem(_:)" landmarkName = "publishItem(_:)"
landmarkType = "5"> landmarkType = "5">
<Locations> <Locations>
@ -278,11 +278,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494254840.86529" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "504" startingLineNumber = "514"
endingLineNumber = "504" endingLineNumber = "514"
landmarkName = "publishItem(_:)" landmarkName = "publishItem(_:)"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@ -294,11 +294,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494254840.86529" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "514" startingLineNumber = "524"
endingLineNumber = "514" endingLineNumber = "524"
landmarkName = "publishItem(_:)" landmarkName = "publishItem(_:)"
landmarkType = "5"> landmarkType = "5">
<Locations> <Locations>
@ -357,11 +357,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494254840.86529" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "524" startingLineNumber = "534"
endingLineNumber = "524" endingLineNumber = "534"
landmarkName = "publishItem(_:)" landmarkName = "publishItem(_:)"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@ -373,11 +373,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "586" startingLineNumber = "606"
endingLineNumber = "586" endingLineNumber = "606"
landmarkName = "ListingPreviewViewController" landmarkName = "ListingPreviewViewController"
landmarkType = "3"> landmarkType = "3">
</BreakpointContent> </BreakpointContent>
@ -389,11 +389,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "579" startingLineNumber = "599"
endingLineNumber = "579" endingLineNumber = "599"
landmarkName = "ListingPreviewViewController" landmarkName = "ListingPreviewViewController"
landmarkType = "3"> landmarkType = "3">
</BreakpointContent> </BreakpointContent>
@ -467,11 +467,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "672" startingLineNumber = "692"
endingLineNumber = "672"> endingLineNumber = "692">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@ -481,11 +481,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "705" startingLineNumber = "725"
endingLineNumber = "705"> endingLineNumber = "725">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@ -527,11 +527,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Vendoo/ListingPreviewViewController.swift" filePath = "Vendoo/ListingPreviewViewController.swift"
timestampString = "494255202.796167" timestampString = "494273923.911173"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "681" startingLineNumber = "701"
endingLineNumber = "681"> endingLineNumber = "701">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy

BIN
Vendoo/.DS_Store vendored
View File

Binary file not shown.

7
Vendoo/FirebaseManager.swift
View File

@ -18,14 +18,13 @@ class FirebaseManager: NSObject {
let ref = FIRDatabase.database().reference() let ref = FIRDatabase.database().reference()
let user_email = ((NSUserDefaults.standardUserDefaults().objectForKey("email") as? String)!).stringByReplacingOccurrencesOfString(".", withString: "_") let user_email = ((NSUserDefaults.standardUserDefaults().objectForKey("email") as? String)!).stringByReplacingOccurrencesOfString(".", withString: "_")
let storage = FIRStorage.storage() let storage = FIRStorage.storage()
let indicator = TYMActivityIndicatorView.init(activityIndicatorStyle: (TYMActivityIndicatorViewStyle.Normal)) var indicator = UIActivityIndicatorView(activityIndicatorStyle: UIActivityIndicatorViewStyle.WhiteLarge)
//let key: String! //let key: String!
override init(){ override init(){
super.init() super.init()
indicator.color = UIColor.blueColor()
//check if user has been created //check if user has been created
self.ref.child("Users").observeSingleEventOfType(.Value, withBlock: { snapshot in self.ref.child("Users").observeSingleEventOfType(.Value, withBlock: { snapshot in
// do some stuff once // do some stuff once

15
Vendoo/ItemTableViewController.swift
View File

@ -10,6 +10,7 @@
This class will be used to retrieve and manipulate data seen by the end user for he/she's item listings This class will be used to retrieve and manipulate data seen by the end user for he/she's item listings
*/ */
import UIKit import UIKit
import TYMActivityIndicatorView
class ItemTableViewController: UIViewController { class ItemTableViewController: UIViewController {
@ -19,6 +20,7 @@ class ItemTableViewController: UIViewController {
@IBOutlet weak var menuButton: UIBarButtonItem! @IBOutlet weak var menuButton: UIBarButtonItem!
var loadingView: UIView!
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
@ -39,10 +41,18 @@ class ItemTableViewController: UIViewController {
menuButton.action = "revealToggle:" menuButton.action = "revealToggle:"
self.view.addGestureRecognizer(self.revealViewController().panGestureRecognizer()) self.view.addGestureRecognizer(self.revealViewController().panGestureRecognizer())
} }
(self.tabBarController as? HomeViewController)?.firebaseManager.indicator.hidesWhenStopped = 1
//self.view.addSubview(((self.tabBarController as? HomeViewController)?.firebaseManager.indicator)!) self.loadingView = UIView(frame: self.view.frame)
self.loadingView.backgroundColor = UIColor.grayColor()
self.loadingView.alpha = 0.4
((self.tabBarController as? HomeViewController)?.firebaseManager.indicator)!.center = self.view.center
self.loadingView.addSubview(((self.tabBarController as? HomeViewController)?.firebaseManager.indicator)!)
self.view.addSubview(loadingView)
(self.tabBarController as? HomeViewController)?.firebaseManager.indicator.startAnimating() (self.tabBarController as? HomeViewController)?.firebaseManager.indicator.startAnimating()
} }
@ -58,6 +68,7 @@ class ItemTableViewController: UIViewController {
func stopIndicator(){ func stopIndicator(){
(self.tabBarController as? HomeViewController)?.firebaseManager.indicator.stopAnimating() (self.tabBarController as? HomeViewController)?.firebaseManager.indicator.stopAnimating()
self.loadingView.removeFromSuperview()
self.itemTable.reloadData() self.itemTable.reloadData()
} }

20
Vendoo/ListingPreviewViewController.swift
View File

@ -39,6 +39,7 @@ class ListingPreviewViewController: UIViewController {
private var alert = UIAlertController(title: "Listing Published", message: "Your listing has been published", preferredStyle: .Alert) private var alert = UIAlertController(title: "Listing Published", message: "Your listing has been published", preferredStyle: .Alert)
private var lastListingKey: String! private var lastListingKey: String!
private var newInProgressListing: Dictionary<String,AnyObject> = Dictionary<String, AnyObject>() private var newInProgressListing: Dictionary<String,AnyObject> = Dictionary<String, AnyObject>()
var loadingView: UIView!
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
@ -147,6 +148,15 @@ extension ListingPreviewViewController {
} }
@IBAction func publishItem(sender: AnyObject) { @IBAction func publishItem(sender: AnyObject) {
self.loadingView = UIView(frame: self.view.frame)
self.loadingView.backgroundColor = UIColor.grayColor()
self.loadingView.alpha = 0.4
self.firManager.indicator.center = self.view.center
self.loadingView.addSubview(self.firManager.indicator)
self.view.addSubview(loadingView)
self.firManager.indicator.startAnimating()
if(self.itemPicture.image == nil){ if(self.itemPicture.image == nil){
let alert = UIAlertController(title: "Image Needed", message: "To proceed to choose networks, you must supply at least one picture for your listing", preferredStyle: .Alert) let alert = UIAlertController(title: "Image Needed", message: "To proceed to choose networks, you must supply at least one picture for your listing", preferredStyle: .Alert)
@ -533,7 +543,17 @@ extension ListingPreviewViewController {
//register new listing id in global path of firebase root' //register new listing id in global path of firebase root'
self.firManager.ref.child("Global_listings").child(newListingRef.key).setValue(newListingRef.key) self.firManager.ref.child("Global_listings").child(newListingRef.key).setValue(newListingRef.key)
self.firManager.indicator.stopAnimating()
let alert = UIAlertController(title: "Listing Posted Successfully", message: "Your listing was submitted to all networks successfully", preferredStyle: .Alert)
alert.addAction(UIAlertAction(title: "OK", style: .Default, handler:{(action: UIAlertAction!) in
self.cancel(self) self.cancel(self)
alert.dismissViewControllerAnimated(true, completion: nil)
}))
self.presentViewController(alert, animated: true, completion: nil)
}) })