Skip to content

Commit

Permalink
-minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MilesCrabbe
MilesCrabbe committed Jun 10, 2014
1 parent 25a09e9 commit 20d5310
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 19 deletions.
8 changes: 8 additions & 0 deletions UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
1B0A691C1938D58C005C821D /* AboutUPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B0A691A1938D58C005C821D /* AboutUPViewController.m */; };
1B0A69211938DA8B005C821D /* UpcomingEventsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B0A691F1938DA8B005C821D /* UpcomingEventsTableViewCell.m */; };
1B0A69221938DA8B005C821D /* UpcomingEventsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1B0A69201938DA8B005C821D /* UpcomingEventsTableViewCell.xib */; };
1B1672BF194760F7001449CD /* Twitter.png in Resources */ = {isa = PBXBuildFile; fileRef = 1B1672BD194760F7001449CD /* Twitter.png */; };
1B1672C0194760F7001449CD /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 1B1672BE194760F7001449CD /* [email protected] */; };
1B48B56819421640008F5186 /* DirectoryTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B48B56619421640008F5186 /* DirectoryTableViewCell.m */; };
1B48B56919421640008F5186 /* DirectoryTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1B48B56719421640008F5186 /* DirectoryTableViewCell.xib */; };
1B48B56C19421C8F008F5186 /* Employee.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B48B56B19421C8F008F5186 /* Employee.m */; };
Expand Down Expand Up @@ -107,6 +109,8 @@
1B0A691E1938DA8B005C821D /* UpcomingEventsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpcomingEventsTableViewCell.h; sourceTree = "<group>"; };
1B0A691F1938DA8B005C821D /* UpcomingEventsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpcomingEventsTableViewCell.m; sourceTree = "<group>"; };
1B0A69201938DA8B005C821D /* UpcomingEventsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UpcomingEventsTableViewCell.xib; sourceTree = "<group>"; };
1B1672BD194760F7001449CD /* Twitter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Twitter.png; sourceTree = "<group>"; };
1B1672BE194760F7001449CD /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1B38F299193F6FD2005158D1 /* UPWebserviceConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UPWebserviceConstants.h; sourceTree = "<group>"; };
1B48B56519421640008F5186 /* DirectoryTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryTableViewCell.h; sourceTree = "<group>"; };
1B48B56619421640008F5186 /* DirectoryTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectoryTableViewCell.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -523,6 +527,8 @@
1BB198BA193F99EC0017A1D6 /* Images */ = {
isa = PBXGroup;
children = (
1B1672BD194760F7001449CD /* Twitter.png */,
1B1672BE194760F7001449CD /* [email protected] */,
1BAE3B4C19463AAA0006AEFD /* Email.png */,
1BAE3B4D19463AAA0006AEFD /* [email protected] */,
1BAE3B4819463A690006AEFD /* Telephone.png */,
Expand Down Expand Up @@ -656,6 +662,7 @@
1BB198D3193FA9F00017A1D6 /* Calendar.png in Resources */,
1B7880F2194105CE00333ED5 /* [email protected] in Resources */,
1B7880E81940EE9000333ED5 /* Contact.png in Resources */,
1B1672C0194760F7001449CD /* [email protected] in Resources */,
1BAE3B4E19463AAA0006AEFD /* Email.png in Resources */,
1BB198C2193F99F70017A1D6 /* Cog.png in Resources */,
1B7880E71940EE9000333ED5 /* [email protected] in Resources */,
Expand All @@ -671,6 +678,7 @@
1BAE3B4B19463A690006AEFD /* [email protected] in Resources */,
1BAE3B4F19463AAA0006AEFD /* [email protected] in Resources */,
1BAE3B54194651DE0006AEFD /* AddressTableViewCell.xib in Resources */,
1B1672BF194760F7001449CD /* Twitter.png in Resources */,
1BB198C3193F99F70017A1D6 /* [email protected] in Resources */,
1BB198D1193FA9F00017A1D6 /* Calendar_filled.png in Resources */,
1BA9FE5E193E1D28008F8981 /* AboutUPViewController.xib in Resources */,
Expand Down
2 changes: 1 addition & 1 deletion UniversityPrograms/UniversityPrograms/AddressTableViewCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OUR TEAM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WCQ-qX-Zf6">
<rect key="frame" x="0.0" y="128" width="320" height="25"/>
<rect key="frame" x="0.0" y="130" width="320" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
Expand Down
15 changes: 9 additions & 6 deletions UniversityPrograms/UniversityPrograms/MyUPInitTableViewCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,36 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="the quick brown fox jumped over the lazy dog" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EJv-3x-hzK">
<rect key="frame" x="163" y="0.0" width="157" height="50"/>
<rect key="frame" x="165" y="0.0" width="155" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="15"/>
<color key="textColor" red="0.24455434970000001" green="0.53691830839999999" blue="0.18466462710000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="kf1-3j-fRW">
<rect key="frame" x="0.0" y="0.0" width="160" height="125"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zG8-9q-odf">
<rect key="frame" x="163" y="44" width="157" height="21"/>
<rect key="frame" x="165" y="50" width="155" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mXg-iO-SVn">
<rect key="frame" x="163" y="73" width="157" height="20"/>
<rect key="frame" x="165" y="75" width="155" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6Jr-hQ-GLY">
<rect key="frame" x="163" y="95" width="157" height="26"/>
<rect key="frame" x="165" y="100" width="155" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
Expand Down
2 changes: 1 addition & 1 deletion UniversityPrograms/UniversityPrograms/RegistrantDTO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
@property NSString *lastName;
@property NSString *email;

-(void)build:(NSString *)eventId;
-(void)buildWithEventID:(NSString *)eventId;
@end
2 changes: 1 addition & 1 deletion UniversityPrograms/UniversityPrograms/RegistrantDTO.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

@implementation RegistrantDTO

-(void)build:(NSString *)eventId{
-(void)buildWithEventID:(NSString *)eventId{
//lot of properties so make a method which builds it
self.email=[[NSUserDefaults standardUserDefaults]stringForKey:@"email"];
self.lastName=[[NSUserDefaults standardUserDefaults]stringForKey:@"userFirstName"];
Expand Down
Binary file added UniversityPrograms/UniversityPrograms/Twitter.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UniversityPrograms/UniversityPrograms/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion UniversityPrograms/UniversityPrograms/UPDataRetrieval.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ +(void)rsvpEvent:(NSString *)cwid event:(Event *)event completetionHandler:(void
//declare what you are getting back
[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
RegistrantDTO *registrant=[[RegistrantDTO alloc]init];
[registrant build:event.eventId];
[registrant buildWithEventID:event.eventId];
NSData *registrantData= [registrant JSONData];
[request setHTTPBody:registrantData];
[NSURLConnection sendAsynchronousRequest:request queue:[UPDataRetrieval _operationQueue] completionHandler:block];
Expand Down
1 change: 1 addition & 0 deletions UniversityPrograms/UniversityPrograms/UPNavigationViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ - (void)viewDidLoad
// Do any additional setup after loading the view.
self.navigationBar.translucent = NO;
self.navigationBar.tintColor = [UIColor lightGrayColor];

//self.navigationBar.barTintColor = [UIColor UPDarkGreyColo\];
//[[UIBarButtonItem appearance] setTintColor:[UIColor whiteColor]];
self.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor grassColor], NSFontAttributeName : [UIFont systemFontOfSize:20]};
Expand Down
6 changes: 3 additions & 3 deletions UniversityPrograms/UniversityPrograms/UpcomingEventsTableViewCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
<rect key="frame" x="12" y="5" width="244" height="29"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="19"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2d" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gqM-5I-JXG">
<rect key="frame" x="229" y="10" width="80" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.92582370923913038" green="0.92582370923913038" blue="0.92582370923913038" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.57000000000000006" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="calibratedRGB"/>
</view>
</subviews>
</tableViewCellContentView>
Expand Down
8 changes: 2 additions & 6 deletions UniversityPrograms/UniversityPrograms/UserInfoViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ @interface UserInfoViewController ()
@property (weak, nonatomic) IBOutlet UITextField *lastName;
@property (weak, nonatomic) IBOutlet UITextField *cwid;
@property (weak, nonatomic) IBOutlet UITextField *email;
@property (weak, nonatomic) IBOutlet UIButton *saveButton;
@property (weak, nonatomic) IBOutlet UIButton *cancelButton;


@end

Expand All @@ -37,10 +36,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];
self.view.backgroundColor = [UIColor UPDarkGreyColor];
self.saveButton.layer.cornerRadius=10.0;
self.cancelButton.layer.cornerRadius=10.0;
[self.saveButton setBackgroundColor:[UIColor successColor]];
[self.cancelButton setBackgroundColor:[UIColor brickRedColor]];

self.firstName.text=[[NSUserDefaults standardUserDefaults] stringForKey:@"userFirstName"];
self.lastName.text=[[NSUserDefaults standardUserDefaults] stringForKey:@"userLastName"];
self.cwid.text=[[NSUserDefaults standardUserDefaults] stringForKey:@"cwid"];
Expand Down

0 comments on commit 20d5310

Please sign in to comment.