Skip to content

Commit

Permalink
Merge branch 'Developer' of https://github.com/uacaps/UniversityProgr…
Browse files Browse the repository at this point in the history
…ams-iPhone into Developer
  • Loading branch information
MilesCrabbe committed Jun 23, 2014
2 parents 9f2f993 + 7c44d49 commit 20a8572
Show file tree
Hide file tree
Showing 14 changed files with 72,469 additions and 8 deletions.
72,389 changes: 72,389 additions & 0 deletions Assets/UniversityPrograms_AppLogo.ai

Large diffs are not rendered by default.

Binary file added Assets/UniversityPrograms_AppLogo_35splash.png
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 Assets/UniversityPrograms_AppLogo_40splash.png
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 Assets/UniversityPrograms_AppLogo_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 38 additions & 6 deletions UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@
1BD4C8161942658F00BE6566 /* GetInvolvedTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1BD4C8141942658F00BE6566 /* GetInvolvedTableViewCell.xib */; };
1BEC1BF9193914BE009DADEF /* UPDataRetrieval.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BEC1BF8193914BE009DADEF /* UPDataRetrieval.m */; };
1BEC1BFF1939183C009DADEF /* NSObject+ObjectMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BEC1BFE1939183C009DADEF /* NSObject+ObjectMap.m */; };
1F52AA941954DB4D0074A83E /* up_splash4.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F52AA901954DB4D0074A83E /* up_splash4.png */; };
1F75DCAD1954DBB2007A24E5 /* up_splash35.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F75DCAC1954DBB2007A24E5 /* up_splash35.png */; };
1F75DCB11954DC07007A24E5 /* icon_58.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F75DCAE1954DC07007A24E5 /* icon_58.png */; };
1F75DCB21954DC07007A24E5 /* icon_80.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F75DCAF1954DC07007A24E5 /* icon_80.png */; };
1F75DCB31954DC07007A24E5 /* icon_120.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F75DCB01954DC07007A24E5 /* icon_120.png */; };
2CF2483000C64B358D0576BC /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C94E53E6222648D7B30F9FE7 /* libPods.a */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -236,6 +241,11 @@
1BEC1BF8193914BE009DADEF /* UPDataRetrieval.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPDataRetrieval.m; sourceTree = "<group>"; };
1BEC1BFD1939183C009DADEF /* NSObject+ObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+ObjectMap.h"; sourceTree = "<group>"; };
1BEC1BFE1939183C009DADEF /* NSObject+ObjectMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+ObjectMap.m"; sourceTree = "<group>"; };
1F52AA901954DB4D0074A83E /* up_splash4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = up_splash4.png; sourceTree = "<group>"; };
1F75DCAC1954DBB2007A24E5 /* up_splash35.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = up_splash35.png; sourceTree = "<group>"; };
1F75DCAE1954DC07007A24E5 /* icon_58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_58.png; sourceTree = "<group>"; };
1F75DCAF1954DC07007A24E5 /* icon_80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_80.png; sourceTree = "<group>"; };
1F75DCB01954DC07007A24E5 /* icon_120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_120.png; sourceTree = "<group>"; };
3FDA9E41BEF34AC4BD93F41E /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; };
C94E53E6222648D7B30F9FE7 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -576,6 +586,8 @@
1BB198BA193F99EC0017A1D6 /* Images */ = {
isa = PBXGroup;
children = (
1F52AA8E1954DB3F0074A83E /* Icons */,
1F52AA8D1954DB3B0074A83E /* Splash */,
1B400F44195225350019FB58 /* Facebook_filled.png */,
1B400F45195225350019FB58 /* [email protected] */,
1B400F46195225350019FB58 /* Facebook.png */,
Expand Down Expand Up @@ -630,6 +642,25 @@
name = "Web Calls";
sourceTree = "<group>";
};
1F52AA8D1954DB3B0074A83E /* Splash */ = {
isa = PBXGroup;
children = (
1F75DCAC1954DBB2007A24E5 /* up_splash35.png */,
1F52AA901954DB4D0074A83E /* up_splash4.png */,
);
name = Splash;
sourceTree = "<group>";
};
1F52AA8E1954DB3F0074A83E /* Icons */ = {
isa = PBXGroup;
children = (
1F75DCAE1954DC07007A24E5 /* icon_58.png */,
1F75DCAF1954DC07007A24E5 /* icon_80.png */,
1F75DCB01954DC07007A24E5 /* icon_120.png */,
);
name = Icons;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -716,6 +747,7 @@
1B0A69121938D520005C821D /* UpcomingEventViewController.xib in Resources */,
1BACD3541937E39700DF7081 /* InfoPlist.strings in Resources */,
1B400F3B1951E5A20019FB58 /* [email protected] in Resources */,
1F75DCB21954DC07007A24E5 /* icon_80.png in Resources */,
1B7880F4194105CE00333ED5 /* [email protected] in Resources */,
1BACD35C1937E39700DF7081 /* Images.xcassets in Resources */,
1BB198D2193FA9F00017A1D6 /* [email protected] in Resources */,
Expand All @@ -725,6 +757,7 @@
1B7880E81940EE9000333ED5 /* Contact.png in Resources */,
1BAE3B4E19463AAA0006AEFD /* Email.png in Resources */,
1BB198C2193F99F70017A1D6 /* Cog.png in Resources */,
1F75DCB31954DC07007A24E5 /* icon_120.png in Resources */,
1B7880E71940EE9000333ED5 /* [email protected] in Resources */,
1B400F42195224950019FB58 /* Twitter.png in Resources */,
1B0A69221938DA8B005C821D /* UpcomingEventsTableViewCell.xib in Resources */,
Expand Down Expand Up @@ -752,6 +785,7 @@
1B400F48195225350019FB58 /* Facebook_filled.png in Resources */,
1BA9FE5E193E1D28008F8981 /* AboutUPViewController.xib in Resources */,
1B400F3A1951E5A20019FB58 /* MapPin.png in Resources */,
1F52AA941954DB4D0074A83E /* up_splash4.png in Resources */,
1B7880F3194105CE00333ED5 /* Pencil.png in Resources */,
1BB198C0193F99F70017A1D6 /* Cog_filled.png in Resources */,
1B7880E91940EE9000333ED5 /* [email protected] in Resources */,
Expand All @@ -760,6 +794,8 @@
1B7880E11940EC8B00333ED5 /* ContactUPViewController.xib in Resources */,
1BB198DB193FAA580017A1D6 /* Info.png in Resources */,
1B7880F1194105CE00333ED5 /* Pencil_filled.png in Resources */,
1F75DCAD1954DBB2007A24E5 /* up_splash35.png in Resources */,
1F75DCB11954DC07007A24E5 /* icon_58.png in Resources */,
1BD4C8161942658F00BE6566 /* GetInvolvedTableViewCell.xib in Resources */,
1BB198D9193FAA580017A1D6 /* Info_filled.png in Resources */,
);
Expand Down Expand Up @@ -959,14 +995,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 3FDA9E41BEF34AC4BD93F41E /* Pods.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "UniversityPrograms/UniversityPrograms-Prefix.pch";
INFOPLIST_FILE = "UniversityPrograms/UniversityPrograms-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
WRAPPER_EXTENSION = app;
Expand All @@ -977,15 +1011,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 3FDA9E41BEF34AC4BD93F41E /* Pods.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "UniversityPrograms/UniversityPrograms-Prefix.pch";
INFOPLIST_FILE = "UniversityPrograms/UniversityPrograms-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
WRAPPER_EXTENSION = app;
Expand Down
2 changes: 2 additions & 0 deletions UniversityPrograms/UniversityPrograms/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ @implementation AppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
sleep(1.0);

self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
// Override point for customization after application launch.
self.window.backgroundColor = [UIColor whiteColor];
Expand Down
2 changes: 1 addition & 1 deletion UniversityPrograms/UniversityPrograms/MyUPViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ -(void)build{
self.emailLabel.textColor = textColor;
self.firstNameLabel.textColor = themeColor;
self.lastNameLabel.textColor = themeColor;
self.myUPImage.image=[UIImage imageNamed:@"UP.jpg"];
self.myUPImage.image=[UIImage imageNamed:@"icon_120.png"];
self.emailLabel.backgroundColor=styleColor;
self.lastNameLabel.backgroundColor=styleColor;
self.firstNameLabel.backgroundColor=styleColor;
Expand Down
5 changes: 4 additions & 1 deletion UniversityPrograms/UniversityPrograms/MyUPViewController.xib
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<action selector="didChangeControlState:" destination="-1" eventType="editingChanged" id="wnt-Wq-hZb"/>
</connections>
</segmentedControl>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="JNx-uW-FOd">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_120.png" id="JNx-uW-FOd">
<rect key="frame" x="10" y="10" width="60" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
Expand Down Expand Up @@ -147,4 +147,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</tableViewCell>
</objects>
<resources>
<image name="icon_120.png" width="120" height="120"/>
</resources>
</document>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIcons</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>icon_80</string>
<string>icon_58</string>
<string>icon_120</string>
</array>
</dict>
</dict>
<key>CFBundleIdentifier</key>
<string>com.uacaps.universityprograms</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -24,6 +36,29 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchImages</key>
<array>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>up_splash4</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{320, 568}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>up_splash35</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{320, 480}</string>
</dict>
</array>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand Down
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/icon_58.png
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/icon_80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 20a8572

Please sign in to comment.