Skip to content

Commit 8a4e44e

Browse files
CFarzanehCFarzaneh
committed
Updated README, removed Prints
1 parent be73a8d commit 8a4e44e

9 files changed

+32
-249
lines changed

‎BridgeHeader.m‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎HackFSU/Base.lproj/Main.storyboard‎

Lines changed: 19 additions & 19 deletions
Large diffs are not rendered by default.

‎HackFSU/CounterView.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class CounterView: UIView {
4545

4646
if countdownManager.hackingHasntStarted() {
4747
percentLeft = 1.0
48-
print("U PLAYED YO SELF")
4948
} else {
5049
percentLeft = timeLeft / fullTime
5150
}
@@ -56,7 +55,6 @@ class CounterView: UIView {
5655
percentLeft = 0.0
5756
}
5857

59-
print(percentLeft)
6058

6159
// 5
6260
let startAngle: CGFloat = 3.0 * π / 2.0

‎HackFSU/HFCountdownViewController.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ class HFCountdownViewController: UIViewController {
116116
hoursTimeLabel.text = "00"
117117
timer.invalidate()
118118
} else if countdownManager.hackingIsCurrent() == true {
119-
print("BRING ME DA MONEY")
120119
countdownManager.incrementHackingState()
121120
self.navigationItem.title = "HACKING OVER"
122121
secondsTimerLabel.text = "00"

‎HackFSU/HFFeedViewController.swift‎

Lines changed: 4 additions & 201 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ class HFFeedViewController: UIViewController, UITableViewDelegate, UITableViewDa
207207

208208
let update = 0
209209
let scheudle = 1
210-
let twitter = 2
211210

212211
let tempCellColor = UIColor.colorFromHex(0xFBFBFB)
213212

@@ -274,24 +273,9 @@ class HFFeedViewController: UIViewController, UITableViewDelegate, UITableViewDa
274273

275274
return cell
276275

277-
case twitter: let cell = UITableViewCell(); return cell
278-
279-
280-
281-
282-
283276
default: let cell = UITableViewCell(); return cell
284277
}
285278

286-
287-
//
288-
//
289-
// let cell: UITableViewCell = tableView.dequeueReusableCellWithIdentifier("HFUpdateTableViewCell")!
290-
//
291-
//
292-
//
293-
//
294-
// return cell
295279
}
296280

297281
func tableView(tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
@@ -336,195 +320,14 @@ class HFFeedViewController: UIViewController, UITableViewDelegate, UITableViewDa
336320
dateFormatterPrint.dateFormat = formatOut
337321

338322
let date: NSDate? = dateFormatterGet.dateFromString(date)
339-
340-
print(date)
341323
return dateFormatterPrint.stringFromDate(date!)
342324
}
343-
344-
345-
325+
346326

347327
@IBAction func feedSegControlValueChanged(sender: AnyObject) {
348-
//self.titles.removeAll()
349-
//callAlamo(apiURL)
328+
350329
self.feedTableView.reloadData()
351-
// checkForContent()
352-
// getUpdatesFromParse()
353-
// getScheduleItemsFromParse()
354-
}
355-
356-
357-
/* checkForContent will check if there is data to be displayed in the view. If not, it will set the correct Glyptodon view. */
358-
/*
359-
func checkForContent() {
360-
let update = 0
361-
let schedule = 1
362-
let twitter = 2
363-
364-
switch(self.feedSegmentControl.selectedSegmentIndex) {
365-
case update: if titles.count == 0 {
366-
feedTableView.alpha = 0.0
367-
tableViewContainerView.glyptodon.show("Getting Updates. Please Wait.")
368-
} else {
369-
tableViewContainerView.glyptodon.hide()
370-
feedTableView.alpha = 1.0
371-
}
372-
case twitter: if twitterFeedArray.count == 0 {
373-
feedTableView.alpha = 0.0
374-
tableViewContainerView.glyptodon.show("Getting Tweets. Please Wait.")
375-
} else {
376-
feedTableView.alpha = 1.0
377-
tableViewContainerView.glyptodon.hide()
378-
}
379-
case schedule: if scheduleFeedArray.count == 0 {
380-
feedTableView.alpha = 0.0
381-
tableViewContainerView.glyptodon.show("Getting Scheudle. Please Wait.")
382-
} else {
383-
feedTableView.alpha = 1.0
384-
tableViewContainerView.glyptodon.hide()
385-
}
386-
default: break
387-
} // End of Switch
388-
}
389-
390-
func getUpdatesFromParse() {
391-
392-
393-
var updatesArray:[HFUpdate] = [HFUpdate]()
394-
let query = PFQuery(className: "Update").orderByDescending("createdAt")
395-
query.findObjectsInBackgroundWithBlock { (objects, error) -> Void in
396-
if let _ = objects {
397-
398-
self.updateFeedArray.removeAll()
399-
400-
for update in objects! {
401-
let newUpdateTitle = update.objectForKey("title") as! String
402-
let newUpdateContent = update.objectForKey("subtitle") as! String
403-
let tempTimestamp = update.createdAt!
404-
let newUpdateTimestamp = self.dateToString(tempTimestamp)
405-
406-
let newUpdate = HFUpdate(title: newUpdateTitle, content: newUpdateContent, timestamp: newUpdateTimestamp)
407-
updatesArray.append(newUpdate)
408-
409-
}
410-
self.updateFeedArray = updatesArray
411-
self.feedTableView.reloadData()
412-
self.checkForContent()
413-
} else {
414-
print(error)
415-
}
416-
}
417-
}
418-
419-
420-
421-
func getScheduleItemsFromParse() {
422-
423-
print("merp ")
424-
425-
var scheduleItemsArray:[HFScheduleItem] = [HFScheduleItem]()
426-
let query = PFQuery(className: "ScheduleItem").orderByAscending("startTime")
427-
var stateForArrayFill = -1
428-
query.findObjectsInBackgroundWithBlock { (obejcts, error) -> Void in
429-
if let _ = obejcts {
430-
431-
self.fridayFeedArray.removeAll()
432-
self.saturdayFeedArray.removeAll()
433-
self.sundayFeedArray.removeAll()
434-
435-
for update in obejcts! {
436-
let newScheduleItemTitle = update.objectForKey("title") as! String
437-
let newScheduleItemSubtitle = update.objectForKey("subtitle") as! String
438-
let newScheduleItemStartTime = update.objectForKey("startTime") as! NSDate
439-
// let newScheduleItemEndTime = update.objectForKey("endTime") as! NSDate
440-
441-
let newScheduleItemStartTimeString = self.timeAsIWantIt(newScheduleItemStartTime)
442-
// let newScheduleItemEndTimeString = self.timeAsIWantIt(newScheduleItemEndTime)
443-
444-
let newScheduleItem = HFScheduleItem(title: newScheduleItemTitle,
445-
subtitle: newScheduleItemSubtitle,
446-
start: newScheduleItemStartTimeString)
447-
448-
stateForArrayFill = self.getDayOfWeek(newScheduleItemStartTime.dateByAddingTimeInterval(18000))
449-
450-
if stateForArrayFill == 0 {
451-
self.fridayFeedArray.append(newScheduleItem)
452-
} else if stateForArrayFill == 1 {
453-
self.saturdayFeedArray.append(newScheduleItem)
454-
} else if stateForArrayFill == 2 {
455-
self.sundayFeedArray.append(newScheduleItem)
456-
}
457-
458-
scheduleItemsArray.append(newScheduleItem)
459-
}
460-
self.scheduleFeedArray = scheduleItemsArray
461-
self.feedTableView.reloadData()
462-
self.checkForContent()
463-
} else {
464-
print(error)
465-
}
466-
}
467-
}
468-
469-
470-
func dateToString(date: NSDate) -> String {
471-
//format date
472-
let dateFormatter = NSDateFormatter()
473-
dateFormatter.dateStyle = .FullStyle
474-
let dateString = dateFormatter.stringFromDate(date)
475-
let brokenStringArray = dateString.componentsSeparatedByString(",")
476-
let dayOfWeek = brokenStringArray[0]
477-
478-
let shortDay = longDayToShortDay(dayOfWeek)
479-
let time = timeAsIWantIt(date)
480-
return "\(shortDay) \(time)"
481-
}
482-
483-
func getDayOfWeek(date: NSDate) -> Int {
484-
let dateFormatter = NSDateFormatter()
485-
dateFormatter.dateStyle = .FullStyle
486-
let dateString = dateFormatter.stringFromDate(date)
487-
let brokenStringArray = dateString.componentsSeparatedByString(",")
488-
let dayOfWeek = brokenStringArray[0]
489-
490-
switch(dayOfWeek) {
491-
case "Sunday": return 2
492-
case "Friday": return 0
493-
case "Saturday": return 1
494-
default: return 1
495-
}
496-
}
497-
498-
func longDayToShortDay(day: String) -> String {
499-
500-
switch(day) {
501-
case "Sunday": return "Sun"
502-
case "Monday": return "Mon"
503-
case "Tuesday": return "Tues"
504-
case "Wedneday": return "Wed"
505-
case "Thursday": return "Thur"
506-
case "Friday": return "Fri"
507-
case "Saturday": return "Sat"
508-
default: return "Sat"
509-
}
510-
511-
}
512-
513-
func timeAsIWantIt(date: NSDate) -> String {
514-
//format date
515-
516-
let dateFormatter = NSDateFormatter()
517-
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
518-
// let dateString = dateFormatter.stringFromDate(date.dateByAddingTimeInterval(18000))
519-
let dateString = dateFormatter.stringFromDate(date)
520-
521-
let timeComponents = dateString.componentsSeparatedByString(":")
522-
let hour = Int(timeComponents[0])
523-
524-
print("\(hour!):\(timeComponents[1])")
525-
526-
return "\(hour!):\(timeComponents[1])"
527-
330+
528331
}
529-
*/
332+
530333
}

‎HackFSU/HFMapViewController.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class HFMapViewController: UIViewController, UITableViewDelegate, UITableViewDat
6060
let title = result["link"].stringValue
6161
let urlOfImages = NSURL(string: title)!
6262

63-
print(title)
6463
getImagesAlamo(urlOfImages)
6564

6665
}
@@ -97,7 +96,7 @@ class HFMapViewController: UIViewController, UITableViewDelegate, UITableViewDat
9796
}
9897

9998
func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
100-
print(indexPath.section)
99+
101100
let cell:HFMapTableViewCell = tableView.dequeueReusableCellWithIdentifier("map") as! HFMapTableViewCell
102101

103102
let thaImages = imagesArray[indexPath.section]

‎HackFSU/HFSponsorViewController.swift‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@ class HFSponsorViewController: UIViewController, UITableViewDelegate, UITableVie
8383
downloader.downloadImage(URLRequest: URLRequest) { response in
8484

8585
if let theimage = response.result.value {
86-
print("valid")
8786
self.imagesArray.append(theimage)
8887
}
8988
else {
90-
print("invalid")
9189
let image = UIImage(named: "placeholder.png")
9290
self.imagesArray.append(image!)
9391
}
@@ -125,9 +123,7 @@ class HFSponsorViewController: UIViewController, UITableViewDelegate, UITableVie
125123
let sponsor = sponsorFeedArray[indexPath.section]
126124
let screenWidth = UIScreen.mainScreen().bounds.width
127125
let screenWidthWithBorders = screenWidth - 16.0
128-
print(screenWidthWithBorders)
129-
let sponsorImageHeight = screenWidthWithBorders * sponsor.getSponsorAspectValue() + 30.0
130-
print(sponsorImageHeight)
126+
let sponsorImageHeight = screenWidthWithBorders * sponsor.getSponsorAspectValue() + 30.0
131127
return sponsorImageHeight
132128
} else {
133129
return 100.0
@@ -165,7 +161,6 @@ class HFSponsorViewController: UIViewController, UITableViewDelegate, UITableVie
165161
let newValue = imageHeight / imageWidth
166162
sponsor.setSponsorAspectValue(newValue)
167163
sponsor.sizeWasEvaluated()
168-
print("taco")
169164

170165
if self.allSizesAreEvaluated() {
171166
self.sponsorTableView.reloadData()

‎HackFSU/Info.plist‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
20+
<string>2.0</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
23-
<key>CFBundleVersion</key>
24-
<string>1</string>
2523
<key>LSRequiresIPhoneOS</key>
2624
<true/>
2725
<key>UIAppFonts</key>

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<h1>HackFSU</h1>
22

33
HackFSU iOS App
4+
Version: 2.0
45

56
The offical iOS application for HackFSU at Florida State University. The HackFSU application will sends updates straight to you phone to keeps you in the know, provide an up-to-date schedule, give you access to maps of the event, allow you to request help from a mentor, and check out our awesome sponsors.
67

@@ -16,11 +17,11 @@ Maps: The maps page gives users access to the maps of the hackathon venue.
1617

1718
Sponsor: The sponsor page is a list of all of our sponsors for the event.
1819

19-
The app uses the libraries Glyptodon, KMPlaceholderTextView, Parse/ParseUI, BEMCheckBox, FlatUIKit, and Agrume.
20+
The app uses the libraries Glyptodon, Alamofire/AlamofireImage, SwiftyJSON, FlatUIKit, and Agrume.
2021

22+
Alamofire - https://github.com/Alamofire/Alamofire <br />
23+
AlamofireImage - https://github.com/Alamofire/AlamofireImage <br />
24+
SwiftyJSON - https://github.com/SwiftyJSON/SwiftyJSON <br />
2125
Glyptodon - https://github.com/marketplacer/Glyptodon <br />
22-
KMPlaceholderTextView - https://github.com/MoZhouqi/KMPlaceholderTextView <br />
23-
Parse - https://github.com/ParsePlatform/Parse-SDK-iOS-OSX <br />
24-
BEMCheckBox - https://github.com/Boris-Em/BEMCheckBox <br />
2526
FlatUIKit - https://github.com/Grouper/FlatUIKit <br />
26-
Agrume - https://github.com/JanGorman/Agrume
27+
Agrume - https://github.com/JanGorman/Agrume

0 commit comments

Comments
 (0)