Skip to content

Commit 6b60efd

Browse files
CFarzanehCFarzaneh
committed
Finished Sponsors and MapView!
1 parent 76091f6 commit 6b60efd

9 files changed

Lines changed: 140 additions & 154 deletions

File tree

‎Hack FSU.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
61CC64C61C472D6200E08521 /* unisans.OTF in Resources */ = {isa = PBXBuildFile; fileRef = 61CC64C51C472D6200E08521 /* unisans.OTF */; };
3939
61D2D14E1BE7C53500145EBF /* HelpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D2D14D1BE7C53500145EBF /* HelpRequest.swift */; };
4040
61F2087E1C51EF4C00B7CD27 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 61F2087D1C51EF4C00B7CD27 /* Assets.xcassets */; };
41+
DFB7BFAD1E4949C1003BC8D0 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = DFB7BFAC1E4949C1003BC8D0 /* placeholder.png */; };
4142
FED2F99B3C2A41A3A9FC2D47 /* Pods_Hack_FSU.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 372CFF18655F81B1F60ED852 /* Pods_Hack_FSU.framework */; };
4243
/* End PBXBuildFile section */
4344

@@ -112,6 +113,7 @@
112113
61D2D14F1BE7C83E00145EBF /* Hack FSU-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Hack FSU-Bridging-Header.h"; sourceTree = "<group>"; };
113114
61F2087D1C51EF4C00B7CD27 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
114115
B364FA72B1545F656248E5EE /* Pods-Hack FSU.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Hack FSU.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Hack FSU/Pods-Hack FSU.debug.xcconfig"; sourceTree = "<group>"; };
116+
DFB7BFAC1E4949C1003BC8D0 /* placeholder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = placeholder.png; sourceTree = "<group>"; };
115117
E0C8C6E9D166446C8B6F2ABE /* Pods-Hack FSU.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Hack FSU.adhoc.xcconfig"; path = "Pods/Target Support Files/Pods-Hack FSU/Pods-Hack FSU.adhoc.xcconfig"; sourceTree = "<group>"; };
116118
E44455C18E0CFED949C518E0 /* Pods-Hack FSU.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Hack FSU.release.xcconfig"; path = "Pods/Target Support Files/Pods-Hack FSU/Pods-Hack FSU.release.xcconfig"; sourceTree = "<group>"; };
117119
/* End PBXFileReference section */
@@ -198,6 +200,7 @@
198200
61551A6E1BD9C0C50091D44A /* Hack FSU */ = {
199201
isa = PBXGroup;
200202
children = (
203+
DFB7BFAC1E4949C1003BC8D0 /* placeholder.png */,
201204
61551A731BD9C0C50091D44A /* Main.storyboard */,
202205
61551A6F1BD9C0C50091D44A /* AppDelegate.swift */,
203206
61EE2DBB1BE3E49E00E80DDF /* Style */,
@@ -238,8 +241,8 @@
238241
615085CF1BDAA55E0066E7BE /* HFMentorViewController.swift */,
239242
615085CD1BDA16D40066E7BE /* HFMapViewController.swift */,
240243
615085F71BDD901B0066E7BE /* HFSponsorViewController.swift */,
241-
6138596E1C348297002F9FA2 /* CounterView.swift */,
242244
613859721C34863E002F9FA2 /* HFCountdownViewController.swift */,
245+
6138596E1C348297002F9FA2 /* CounterView.swift */,
243246
);
244247
name = Views;
245248
sourceTree = "<group>";
@@ -398,6 +401,7 @@
398401
61551A7A1BD9C0C50091D44A /* LaunchScreen.storyboard in Resources */,
399402
61551A751BD9C0C50091D44A /* Main.storyboard in Resources */,
400403
61F2087E1C51EF4C00B7CD27 /* Assets.xcassets in Resources */,
404+
DFB7BFAD1E4949C1003BC8D0 /* placeholder.png in Resources */,
401405
61CC64C61C472D6200E08521 /* unisans.OTF in Resources */,
402406
);
403407
runOnlyForDeploymentPostprocessing = 0;

‎Hack FSU.xcworkspace/xcuserdata/cfarzaneh.xcuserdatad/UserInterfaceState.xcuserstate‎

14.1 KB
Binary file not shown.

‎Hack FSU/Base.lproj/Main.storyboard‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="qcA-1o-KTz">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="qcA-1o-KTz">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
@@ -48,7 +48,7 @@
4848
<rect key="frame" x="0.0" y="28" width="584" height="60"/>
4949
<autoresizingMask key="autoresizingMask"/>
5050
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fRY-kM-L8L" id="lS9-ZN-e8h">
51-
<rect key="frame" x="0.0" y="0.0" width="584" height="59"/>
51+
<rect key="frame" x="0.0" y="0.0" width="584" height="59.5"/>
5252
<autoresizingMask key="autoresizingMask"/>
5353
<subviews>
5454
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zVP-T0-Wla">
@@ -95,7 +95,7 @@
9595
<rect key="frame" x="0.0" y="88" width="584" height="34"/>
9696
<autoresizingMask key="autoresizingMask"/>
9797
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BmI-ze-Qys" id="4Ij-bw-ha9">
98-
<rect key="frame" x="0.0" y="0.0" width="584" height="33"/>
98+
<rect key="frame" x="0.0" y="0.0" width="584" height="33.5"/>
9999
<autoresizingMask key="autoresizingMask"/>
100100
<subviews>
101101
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gqr-ZC-MLS">
@@ -120,7 +120,7 @@
120120
<rect key="frame" x="0.0" y="122" width="584" height="60"/>
121121
<autoresizingMask key="autoresizingMask"/>
122122
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tgg-kW-y6b" id="dNM-QB-d2C">
123-
<rect key="frame" x="0.0" y="0.0" width="584" height="59"/>
123+
<rect key="frame" x="0.0" y="0.0" width="584" height="59.5"/>
124124
<autoresizingMask key="autoresizingMask"/>
125125
<subviews>
126126
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4oM-NY-xhM">
@@ -655,7 +655,7 @@
655655
<rect key="frame" x="0.0" y="28" width="580" height="415"/>
656656
<autoresizingMask key="autoresizingMask"/>
657657
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2sa-ss-bgz" id="rDG-rL-34f">
658-
<rect key="frame" x="0.0" y="0.0" width="580" height="414"/>
658+
<rect key="frame" x="0.0" y="0.0" width="580" height="414.5"/>
659659
<autoresizingMask key="autoresizingMask"/>
660660
<subviews>
661661
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" restorationIdentifier="PFImageView" translatesAutoresizingMaskIntoConstraints="NO" id="1fp-EJ-h1o" customClass="PFImageView">
@@ -692,7 +692,7 @@
692692
<rect key="frame" x="0.0" y="443" width="580" height="30"/>
693693
<autoresizingMask key="autoresizingMask"/>
694694
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xjT-Ew-s9b" id="EJy-Dh-8VU">
695-
<rect key="frame" x="0.0" y="0.0" width="580" height="29"/>
695+
<rect key="frame" x="0.0" y="0.0" width="580" height="29.5"/>
696696
<autoresizingMask key="autoresizingMask"/>
697697
<subviews>
698698
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j0G-st-f8K">
@@ -799,7 +799,7 @@
799799
<rect key="frame" x="0.0" y="28" width="600" height="372"/>
800800
<autoresizingMask key="autoresizingMask"/>
801801
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" tableViewCell="S4m-Mn-7Dk" id="2KH-88-B4i">
802-
<rect key="frame" x="0.0" y="0.0" width="600" height="371"/>
802+
<rect key="frame" x="0.0" y="0.0" width="600" height="371.5"/>
803803
<autoresizingMask key="autoresizingMask"/>
804804
<subviews>
805805
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="firstFloor" translatesAutoresizingMaskIntoConstraints="NO" id="zA1-Z7-ARW">
@@ -872,7 +872,7 @@
872872
<rect key="frame" x="0.0" y="28" width="580" height="423"/>
873873
<autoresizingMask key="autoresizingMask"/>
874874
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="67n-5F-cNp" id="WXD-yc-evG">
875-
<rect key="frame" x="0.0" y="0.0" width="580" height="422"/>
875+
<rect key="frame" x="0.0" y="0.0" width="580" height="422.5"/>
876876
<autoresizingMask key="autoresizingMask"/>
877877
<subviews>
878878
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" restorationIdentifier="PFImageView" translatesAutoresizingMaskIntoConstraints="NO" id="PeT-4c-TMe" customClass="PFImageView">
@@ -895,7 +895,7 @@
895895
</tableViewCellContentView>
896896
<color key="backgroundColor" red="0.13725490200000001" green="0.43529411759999997" blue="0.78039215689999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
897897
<connections>
898-
<outlet property="mapImage" destination="PeT-4c-TMe" id="Iol-Us-n7R"/>
898+
<outlet property="mapImage" destination="PeT-4c-TMe" id="EoY-Oe-G52"/>
899899
</connections>
900900
</tableViewCell>
901901
</prototypes>

‎Hack FSU/HFCountdownViewController.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import UIKit
1010
import Parse
11+
import Alamofire
12+
import SwiftyJSON
1113

1214
var globalEventTimeLeft:CGFloat = NSDate.timeUntil(NSDate())
1315
var countdownManager = HFCountdownManager()

‎Hack FSU/HFFeedViewController.swift‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,21 @@ class HFFeedViewController: UIViewController, UITableViewDelegate, UITableViewDa
145145
else if (url == scheduleapiURL) {
146146
for results in theJSON["schedule_items"].arrayValue {
147147
let name = results["name"].stringValue
148-
self.scheduleNames.append(name)
148+
let description = results["description"].stringValue
149+
let startTime = results["start"].stringValue
150+
151+
let finalStartTime = theTIMEBIH(startTime,format: "E h:mm a");
152+
153+
let newScheduleItem = HFScheduleItem(title: name,
154+
subtitle: description,
155+
start: finalStartTime)
156+
self.fridayFeedArray.append(newScheduleItem)
149157
}
150158

151159
}
152-
153-
// for i in self.scheduleNames {
154-
// print(i)
155-
// }
160+
for i in self.scheduleNames {
161+
print(i)
162+
}
156163
self.feedTableView.reloadData()
157164
}
158165

@@ -210,7 +217,7 @@ class HFFeedViewController: UIViewController, UITableViewDelegate, UITableViewDa
210217

211218
let hi = updatesDates[indexPath.section]
212219

213-
cell.timestamp.text = theTIMEBIH(hi);
220+
cell.timestamp.text = theTIMEBIH(hi,format: "E h:mm a");
214221

215222
cell.configureFlatCellWithColor(tempCellColor, selectedColor: tempCellColor, roundingCorners: .AllCorners)
216223
cell.cornerRadius = 3.5
@@ -315,17 +322,17 @@ class HFFeedViewController: UIViewController, UITableViewDelegate, UITableViewDa
315322
}
316323
}
317324

318-
func theTIMEBIH(date: String) -> String {
325+
func theTIMEBIH(date: String, format: String) -> String {
319326

320327
let dateFormatterGet = NSDateFormatter()
321328
dateFormatterGet.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
322329

323330
let dateFormatterPrint = NSDateFormatter()
324-
dateFormatterPrint.dateFormat = "E h:mm a"
331+
dateFormatterPrint.dateFormat = format
325332

326333
let date: NSDate? = dateFormatterGet.dateFromString(date)
327334

328-
335+
print(date)
329336
return dateFormatterPrint.stringFromDate(date!)
330337
}
331338

0 commit comments

Comments
 (0)