From 20d53106635eae33c899b0c9ff63f266bcf8981c Mon Sep 17 00:00:00 2001 From: Miles Crabbe Date: Tue, 10 Jun 2014 13:17:43 -0500 Subject: [PATCH] -minor changes --- .../UniversityPrograms.xcodeproj/project.pbxproj | 8 ++++++++ .../UniversityPrograms/AddressTableViewCell.xib | 2 +- .../UniversityPrograms/MyUPInitTableViewCell.xib | 15 +++++++++------ .../UniversityPrograms/RegistrantDTO.h | 2 +- .../UniversityPrograms/RegistrantDTO.m | 2 +- .../UniversityPrograms/Twitter.png | Bin 0 -> 1572 bytes .../UniversityPrograms/Twitter@2x.png | Bin 0 -> 2002 bytes .../UniversityPrograms/UPDataRetrieval.m | 2 +- .../UPNavigationViewController.m | 1 + .../UpcomingEventsTableViewCell.xib | 6 +++--- .../UniversityPrograms/UserInfoViewController.m | 8 ++------ 11 files changed, 27 insertions(+), 19 deletions(-) create mode 100755 UniversityPrograms/UniversityPrograms/Twitter.png create mode 100755 UniversityPrograms/UniversityPrograms/Twitter@2x.png diff --git a/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj b/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj index 88562cd..7291449 100644 --- a/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj +++ b/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj @@ -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 /* Twitter@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1B1672BE194760F7001449CD /* Twitter@2x.png */; }; 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 */; }; @@ -107,6 +109,8 @@ 1B0A691E1938DA8B005C821D /* UpcomingEventsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpcomingEventsTableViewCell.h; sourceTree = ""; }; 1B0A691F1938DA8B005C821D /* UpcomingEventsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpcomingEventsTableViewCell.m; sourceTree = ""; }; 1B0A69201938DA8B005C821D /* UpcomingEventsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UpcomingEventsTableViewCell.xib; sourceTree = ""; }; + 1B1672BD194760F7001449CD /* Twitter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Twitter.png; sourceTree = ""; }; + 1B1672BE194760F7001449CD /* Twitter@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Twitter@2x.png"; sourceTree = ""; }; 1B38F299193F6FD2005158D1 /* UPWebserviceConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UPWebserviceConstants.h; sourceTree = ""; }; 1B48B56519421640008F5186 /* DirectoryTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryTableViewCell.h; sourceTree = ""; }; 1B48B56619421640008F5186 /* DirectoryTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectoryTableViewCell.m; sourceTree = ""; }; @@ -523,6 +527,8 @@ 1BB198BA193F99EC0017A1D6 /* Images */ = { isa = PBXGroup; children = ( + 1B1672BD194760F7001449CD /* Twitter.png */, + 1B1672BE194760F7001449CD /* Twitter@2x.png */, 1BAE3B4C19463AAA0006AEFD /* Email.png */, 1BAE3B4D19463AAA0006AEFD /* Email@2x.png */, 1BAE3B4819463A690006AEFD /* Telephone.png */, @@ -656,6 +662,7 @@ 1BB198D3193FA9F00017A1D6 /* Calendar.png in Resources */, 1B7880F2194105CE00333ED5 /* Pencil_filled@2x.png in Resources */, 1B7880E81940EE9000333ED5 /* Contact.png in Resources */, + 1B1672C0194760F7001449CD /* Twitter@2x.png in Resources */, 1BAE3B4E19463AAA0006AEFD /* Email.png in Resources */, 1BB198C2193F99F70017A1D6 /* Cog.png in Resources */, 1B7880E71940EE9000333ED5 /* Contact_filled@2x.png in Resources */, @@ -671,6 +678,7 @@ 1BAE3B4B19463A690006AEFD /* Telephone@2x.png in Resources */, 1BAE3B4F19463AAA0006AEFD /* Email@2x.png in Resources */, 1BAE3B54194651DE0006AEFD /* AddressTableViewCell.xib in Resources */, + 1B1672BF194760F7001449CD /* Twitter.png in Resources */, 1BB198C3193F99F70017A1D6 /* Cog@2x.png in Resources */, 1BB198D1193FA9F00017A1D6 /* Calendar_filled.png in Resources */, 1BA9FE5E193E1D28008F8981 /* AboutUPViewController.xib in Resources */, diff --git a/UniversityPrograms/UniversityPrograms/AddressTableViewCell.xib b/UniversityPrograms/UniversityPrograms/AddressTableViewCell.xib index 2a75e08..550935c 100644 --- a/UniversityPrograms/UniversityPrograms/AddressTableViewCell.xib +++ b/UniversityPrograms/UniversityPrograms/AddressTableViewCell.xib @@ -46,7 +46,7 @@ - + diff --git a/UniversityPrograms/UniversityPrograms/UserInfoViewController.m b/UniversityPrograms/UniversityPrograms/UserInfoViewController.m index 57b938b..9da1b12 100644 --- a/UniversityPrograms/UniversityPrograms/UserInfoViewController.m +++ b/UniversityPrograms/UniversityPrograms/UserInfoViewController.m @@ -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 @@ -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"];