Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added about page, re-implemented 4th yelp API key.

  • Loading branch information...
commit bb16522a74fb645816874ac43c9e083ba16304cd 1 parent a4a4099
@xirianlight xirianlight authored
View
6 MappingMashupApp.xcodeproj/project.pbxproj
@@ -37,6 +37,7 @@
838961521703914700CC86B9 /* PaulFinalLarge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8389614E1703914700CC86B9 /* PaulFinalLarge@2x.png */; };
838961531703914700CC86B9 /* RossFinalLarge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8389614F1703914700CC86B9 /* RossFinalLarge@2x.png */; };
838961571703AECF00CC86B9 /* wiWhere512@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 838961561703AECF00CC86B9 /* wiWhere512@2x.png */; };
+ 839BFAE21703BF560061F5BC /* AboutUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 839BFAE11703BF560061F5BC /* AboutUsViewController.m */; };
83B0D00516FA1A1900C9D8F8 /* BookmarksViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B0D00416FA1A1900C9D8F8 /* BookmarksViewController.m */; };
83B0D00A16FA1A8900C9D8F8 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B0D00916FA1A8900C9D8F8 /* HistoryViewController.m */; };
83BB6B6B16FA0A31003A4506 /* circleMask6464.png in Resources */ = {isa = PBXBuildFile; fileRef = 83BB6B6A16FA0A31003A4506 /* circleMask6464.png */; };
@@ -127,6 +128,8 @@
8389614E1703914700CC86B9 /* PaulFinalLarge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "PaulFinalLarge@2x.png"; sourceTree = "<group>"; };
8389614F1703914700CC86B9 /* RossFinalLarge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "RossFinalLarge@2x.png"; sourceTree = "<group>"; };
838961561703AECF00CC86B9 /* wiWhere512@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wiWhere512@2x.png"; sourceTree = "<group>"; };
+ 839BFAE01703BF550061F5BC /* AboutUsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutUsViewController.h; sourceTree = "<group>"; };
+ 839BFAE11703BF560061F5BC /* AboutUsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutUsViewController.m; sourceTree = "<group>"; };
83B0D00316FA1A1900C9D8F8 /* BookmarksViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarksViewController.h; sourceTree = "<group>"; };
83B0D00416FA1A1900C9D8F8 /* BookmarksViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookmarksViewController.m; sourceTree = "<group>"; };
83B0D00816FA1A8900C9D8F8 /* HistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryViewController.h; sourceTree = "<group>"; };
@@ -323,6 +326,8 @@
8F372B5E16F269B100302B80 /* View Controllers */ = {
isa = PBXGroup;
children = (
+ 839BFAE01703BF550061F5BC /* AboutUsViewController.h */,
+ 839BFAE11703BF560061F5BC /* AboutUsViewController.m */,
83B0D00716FA1A2000C9D8F8 /* Tab View Items */,
83FE37E016F76CD6000C9935 /* FlickrMapViewController.h */,
83FE37E116F76CD6000C9935 /* FlickrMapViewController.m */,
@@ -535,6 +540,7 @@
6B2A007816FB984600F0C703 /* NSString+Extended.m in Sources */,
6B2F834B16FF51C4004551F9 /* BookmarkedBusiness.m in Sources */,
B482104016FFE579004EE1CF /* UIView+AnimationTools.m in Sources */,
+ 839BFAE21703BF560061F5BC /* AboutUsViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
2  MappingMashupApp/APIManager.m
@@ -56,7 +56,7 @@ - (APIManager*)initWithYelpSearch:(NSString*)search andLocation:(CLLocationCoord
keyToUse = @"xltTZDS7mgHV7wtu8MkZSg";
break;
case 2:
- keyToUse = @"xltTZDS7mgHV7wtu8MkZSg"; //Currently disabled, was Paul's key, now a dupe of case 1
+ keyToUse = @"0mtAebqxwAxzHVOPI_OIyQ";
break;
case 3:
keyToUse = @"ylWkpXJFz6-ZI3PvDG519A";
View
13 MappingMashupApp/AboutUsViewController.h
@@ -0,0 +1,13 @@
+//
+// AboutUsViewController.h
+// MappingMashupApp
+//
+// Created by Ross Matsuda on 3/27/13.
+// Copyright (c) 2013 The Peanut Gallery. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AboutUsViewController : UIViewController
+
+@end
View
75 MappingMashupApp/AboutUsViewController.m
@@ -0,0 +1,75 @@
+//
+// AboutUsViewController.m
+// MappingMashupApp
+//
+// Created by Ross Matsuda on 3/27/13.
+// Copyright (c) 2013 The Peanut Gallery. All rights reserved.
+//
+
+#import "AboutUsViewController.h"
+
+@interface AboutUsViewController ()
+{
+
+ __weak IBOutlet UIButton *rossPeanut;
+ __weak IBOutlet UIButton *paulPeanut;
+ __weak IBOutlet UIButton *emilyPeanut;
+ __weak IBOutlet UIButton *davidPeanut;
+ __weak IBOutlet UITextView *aboutTextField;
+}
+- (IBAction)davidPeanutTapped:(id)sender;
+- (IBAction)emilyPeanutTapped:(id)sender;
+- (IBAction)paulPeanutTapped:(id)sender;
+- (IBAction)rossPeanutTapped:(id)sender;
+
+@end
+
+@implementation AboutUsViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+ if (self) {
+ // Custom initialization
+ }
+ return self;
+}
+
+- (void)viewDidLoad
+{
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning
+{
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)davidPeanutTapped:(id)sender
+{
+ [UIView animateWithDuration:0.5 animations:^(void){ davidPeanut.center = CGPointMake(davidPeanut.center.x, 88);rossPeanut.center = CGPointMake(rossPeanut.center.x, 45); emilyPeanut.center = CGPointMake(emilyPeanut.center.x, 45); paulPeanut.center = CGPointMake(paulPeanut.center.x, 45);} completion:^(BOOL finished) {
+ aboutTextField.text = @"David Johnston \n \nYou mustn't hate you're how you dress \nin plastic pants and false finess \nif helps it fill your emptiness. \n \nAnd cringe I not you phone your shrink \nwith cries of dump you in the drink; \njust roll you up in royal mink \n \nand seek a spot off somewhere back \nso silent sweet and softly black \nto there your torrid worry stack \n \nand rest yourself. \nThings will work out.";
+ }];
+}
+
+- (IBAction)emilyPeanutTapped:(id)sender {
+ [UIView animateWithDuration:0.5 animations:^(void){ davidPeanut.center = CGPointMake(davidPeanut.center.x, 42);rossPeanut.center = CGPointMake(rossPeanut.center.x, 45); emilyPeanut.center = CGPointMake(emilyPeanut.center.x, 85); paulPeanut.center = CGPointMake(paulPeanut.center.x, 45);} completion:^(BOOL finished) {
+ aboutTextField.text = @"Emily Oess\n\n-|gBit@eOS|~| |:)\n-$ zonnet\n\nChicago-Brown Line Station\nYou are at the end of an el platform in an urban environment west of a big blue lake. A turnstile leads to a set of stairs. In the distance, you can see that the stairs will eventually fork off. The buildings here are very tall concrete buildings, and they are spaced (relatively) equidistant from each other. There is a girl here.\n> look girl\nThe girl appears pretty normal from the outside, but if superhero movies have taught you anything it's that masked avengers frequently look super ordinary in broad daylight because that's obviously how you conceal your identity. No, sir. Because while this girl may enjoys long walks on the beach, she also digs refactoring code. And then you realize you're talking to yourself.\n> look\nYou are still on the el platform. Looking at the clock on your iPhone, you notice another train has arrived and you have no idea exactly how long you've been standing here wrapped up in meta-cognition. Better get going or you're going to be late, yo.\n> down\nN Franklin/W Superior Intersection\nYou are at an intersection of two streets, one running north/south, and one running east/west. You can also go back up the stairs.\n> south\nN Franklin/W Huron Intersection\nYou are on the continuation of a city street. There are more buildings on both sides of you. The roads continue north/south and east/west.\n> s\nN Franklin/W Erie Intersection\nYou are STILL on the continuation of a city street. In the distance you can see that it will eventually hit a river. You notice The Mobile Makers building to the southeast.\n> se\nBuilding front\nThere is a building in front of you to the south, and the road leads back to the east/west.\n> in\nYou don't have a key that can open this door. Luckily, a group of people walk up and go in.\n> tailgate\nLobby\nYou are in the building lobby. There are stairs and an elevator here. Your spidey sense kicks in and you realize there is another nerd in close proximity.\n> talk to nerd\nYou attempt to talk to the nerd, but cannot hear his response because you've been rockin' out to some mad beats.\n> take out earbuds\nYou take out your headphones and start a conversation that makes everyone around take a step back. They obviously fear catching the nerditude.\n> turn up volume\nDone. Bring the noise.";
+ }];
+
+}
+
+- (IBAction)paulPeanutTapped:(id)sender {
+ [UIView animateWithDuration:0.5 animations:^(void){ davidPeanut.center = CGPointMake(davidPeanut.center.x, 42);rossPeanut.center = CGPointMake(rossPeanut.center.x, 45); emilyPeanut.center = CGPointMake(emilyPeanut.center.x, 45); paulPeanut.center = CGPointMake(paulPeanut.center.x, 85);} completion:^(BOOL finished) {
+ aboutTextField.text = @"Paul Heayn \n \nDuring the cold war, Paul escaped into West Germany where he established himself as a merchant of freedom. Through daring plans of stealth, Paul managed to liberate 3,642 East Germans. \n \nAfter the end of the Cold War, Paul migrated to the island of Krakatoa where he helped the native people engineer Cold Fusion and a Monorail. Unfortunately, in a tragic series of events the Monorail derailed into the Cold Fusion plant, thereby destroying the world's first plant capable of generating nuclear energy without radioactive byproduct.\n \nPaul fled Krakatoa after 'The Incident' to Riverside, Iowa where he purchased a soy bean farm and blended in as a townsman. Unfortunately, during the pope's visit to Riverside, Paul mistakenly got into a slap fight with Pope John Paul II.\n \nOnce again, Paul was forced to leave. Living a nomadic life of adventure Paul walked through the Americas only to end up at The Mobile Makers for the Winter 2013 class.";
+ }];
+}
+
+- (IBAction)rossPeanutTapped:(id)sender {
+ [UIView animateWithDuration:0.5 animations:^(void){ davidPeanut.center = CGPointMake(davidPeanut.center.x, 42);rossPeanut.center = CGPointMake(rossPeanut.center.x, 85); emilyPeanut.center = CGPointMake(emilyPeanut.center.x, 45); paulPeanut.center = CGPointMake(paulPeanut.center.x, 45);} completion:^(BOOL finished) {
+ aboutTextField.text = @"Ross Matsuda \n \nRoss Matsuda has a background in graphic design, psychology, tech support and theatrical directing. He's a proud graduate of MobileMakers and will be continuing with his career in mobile application development, graphic design and user experience. When it is contextually appropriate, he speaks in the third person to maintain a professional tone - to this day, he can't fully understand why that is. He wants to spend his life figuring out things that people need before they know they need them. He doesn't need to change the world with each project he works on, but at least wants to raise the bar. Here's to more years of innovation, yes?";
+ }];
+}
+@end
View
42 MappingMashupApp/AppDelegate.m
@@ -38,7 +38,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc]initWithManagedObjectModel:managedObjectModel];
- // if there isn't a data base....
+ // if there isn't a database....
if ([persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:sqliteURL options:nil error:&error])
{
//create one.
@@ -51,14 +51,36 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
locationManager = [[LocationManager alloc] init];
//myCurrentGPSLocation = locationManager.coordinate;
//NSLog(@"This is our coordinate %f", locationManager.coordinate.latitude);
+ CGRect screenBound = [[UIScreen mainScreen] bounds];
+ CGSize screenSize = screenBound.size;
+ CGFloat screenHeight = screenSize.height;
-
+ //Setup for loading page
UIImageView *imageView =[[UIImageView alloc]initWithFrame:self.window.bounds];
- UIImage *image = [UIImage imageNamed:@"Default.png"];
- if (!image) {
- NSLog(@" we failed to load the image during the screen thing in the didFinish.. in the AppDelegate at line 24");
+
+ if (screenHeight == 480)
+ {
+ //Device is iPhone 4 or 4S in point height
+ UIImage *image = [UIImage imageNamed:@"Default@2x.png"];
+ if (!image)
+ {
+ NSLog(@" we failed to load the image during the screen thing in the didFinish.. in the AppDelegate at line 64");
+ }
+ imageView.image = image;
+
}
- imageView.image = image;
+ if (screenHeight == 568)
+ {
+ //Device is iPhone 5 in point height
+ UIImage *image = [UIImage imageNamed:@"Default-568h@2x.png"];
+ if (!image)
+ {
+ NSLog(@" we failed to load the image during the screen thing in the didFinish.. in the AppDelegate at line 74");
+ }
+ imageView.image = image;
+
+ }
+
[self.window addSubview:imageView];
[self.window makeKeyAndVisible];
[self.window bringSubviewToFront:imageView];
@@ -70,7 +92,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
-(void)removeSplash:(UIImageView*)splashView
{
- [splashView removeFromSuperview];
+ [UIView animateWithDuration:0.75 animations:^(void) { splashView.center = CGPointMake(splashView.center.x+400, splashView.center.y);
+ } completion:^(BOOL finished) {[splashView removeFromSuperview];}];
+// [UIView animateWithDuration:1 animations:^(void)
+// {
+// splashView.center = CGPointMake(splashView.center.x+400, splashView.center.y);
+// }];
+// [splashView removeFromSuperview];
}
- (void)applicationWillResignActive:(UIApplication *)application
View
128 MappingMashupApp/en.lproj/MainStoryboard.storyboard
@@ -4,7 +4,104 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
<scenes>
- <!--Yelp Map View Controller - WiFi Locations-->
+ <!--About Us View Controller - About Us-->
+ <scene sceneID="kbE-rZ-YS8">
+ <objects>
+ <viewController id="qNr-I4-kD3" customClass="AboutUsViewController" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="RsJ-gE-J2U">
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="silverBG@2x.png" id="fEY-tn-bIv">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </imageView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Bs0-ci-AOy">
+ <rect key="frame" x="0.0" y="-3" width="73" height="93"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal" title="David" image="DavidFinalLarge@2x.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="davidPeanutTapped:" destination="qNr-I4-kD3" eventType="touchUpInside" id="ANe-Ak-lj8"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6aO-rI-Jix">
+ <rect key="frame" x="75" y="0.0" width="73" height="90"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal" title="Emily" image="EmilyFinalLarge@2x.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="emilyPeanutTapped:" destination="qNr-I4-kD3" eventType="touchUpInside" id="gsB-4O-iWj"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="yDs-br-NVb">
+ <rect key="frame" x="156" y="0.0" width="76" height="90"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal" title="Paul" image="PaulFinalLarge@2x.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="paulPeanutTapped:" destination="qNr-I4-kD3" eventType="touchUpInside" id="I3f-hY-MBn"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EYY-cs-mQC">
+ <rect key="frame" x="251" y="0.0" width="49" height="90"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal" title="Ross" image="RossFinalLarge@2x.png">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="rossPeanutTapped:" destination="qNr-I4-kD3" eventType="touchUpInside" id="XDU-He-wWQ"/>
+ </connections>
+ </button>
+ <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" id="UAD-fW-jEe">
+ <rect key="frame" x="20" y="124" width="280" height="360"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <mutableString key="text">Wi-Where is a project developed by the four peanuts you see above this very text. Our goal was to let a user discover new places to connect through a visual browsing experience. When you want to get online out of the house, you find yourself at cafés, restaurants, parks - and more often than not, the same ones over and over again. What if you had some sort of insight as to the environment around new destinations before you left? Using Wi-Where, you can see interesting pictures taken around these locales that provide complimentary wifi access to make sure you find one that will suit your taste.</mutableString>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+ </textView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
+ <navigationItem key="navigationItem" title="About Us" id="n9o-rc-mEC"/>
+ <connections>
+ <outlet property="aboutTextField" destination="UAD-fW-jEe" id="G9x-lG-rmQ"/>
+ <outlet property="davidPeanut" destination="Bs0-ci-AOy" id="HbI-I7-k8P"/>
+ <outlet property="emilyPeanut" destination="6aO-rI-Jix" id="ePn-XS-pQr"/>
+ <outlet property="paulPeanut" destination="yDs-br-NVb" id="XUp-5T-pT2"/>
+ <outlet property="rossPeanut" destination="EYY-cs-mQC" id="wqS-rO-ODM"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="unn-63-mKB" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="1017" y="-666"/>
+ </scene>
+ <!--Yelp Map View Controller - WiFi Venues-->
<scene sceneID="5">
<objects>
<viewController id="2" customClass="YelpMapViewController" sceneMemberID="viewController">
@@ -64,7 +161,7 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
- <navigationItem key="navigationItem" title="WiFi Locations" id="ONv-7V-dEl"/>
+ <navigationItem key="navigationItem" title="WiFi Venues" id="ONv-7V-dEl"/>
<connections>
<outlet property="photoViewerUIImageView" destination="RGB-yg-ZJ4" id="f5B-9i-u7Z"/>
<outlet property="yelpMapView" destination="fse-RH-zXz" id="HHQ-eP-hJK"/>
@@ -104,6 +201,7 @@
</state>
<connections>
<action selector="infoButtonPressed:" destination="L5I-mE-d7D" eventType="touchUpInside" id="Bir-9c-G7K"/>
+ <segue destination="qNr-I4-kD3" kind="push" identifier="toAboutPage" id="tlW-C7-EqV"/>
</connections>
</button>
<view contentMode="scaleToFill" id="QIi-SX-ZAA">
@@ -130,7 +228,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="wiWhere512@2x.png" id="veT-vc-0vB">
- <rect key="frame" x="98.5" y="75.5" width="128" height="128"/>
+ <rect key="frame" x="98" y="96" width="128" height="128"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
@@ -438,6 +536,10 @@
</scene>
</scenes>
<resources>
+ <image name="DavidFinalLarge@2x.png" width="514" height="800"/>
+ <image name="EmilyFinalLarge@2x.png" width="514" height="800"/>
+ <image name="PaulFinalLarge@2x.png" width="514" height="800"/>
+ <image name="RossFinalLarge@2x.png" width="339" height="800"/>
<image name="backArrow@2x.png" width="38" height="41"/>
<image name="closeButton@2x.png" width="64" height="64"/>
<image name="forwardArrow@2x.png" width="38" height="41"/>
@@ -449,6 +551,20 @@
<image name="yelpMapViewShader@2x.png" width="640" height="390"/>
</resources>
<classes>
+ <class className="AboutUsViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutUsViewController.h"/>
+ <relationships>
+ <relationship kind="action" name="davidPeanutTapped:"/>
+ <relationship kind="action" name="emilyPeanutTapped:"/>
+ <relationship kind="action" name="paulPeanutTapped:"/>
+ <relationship kind="action" name="rossPeanutTapped:"/>
+ <relationship kind="outlet" name="aboutTextField" candidateClass="UITextView"/>
+ <relationship kind="outlet" name="davidPeanut" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="emilyPeanut" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="paulPeanut" candidateClass="UIButton"/>
+ <relationship kind="outlet" name="rossPeanut" candidateClass="UIButton"/>
+ </relationships>
+ </class>
<class className="BookmarksViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/BookmarksViewController.h"/>
<relationships>
@@ -475,13 +591,9 @@
<relationship kind="outlet" name="historyTableViewOutlet" candidateClass="UITableView"/>
</relationships>
</class>
- <class className="UIStoryboardSegue" superclassName="NSObject">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/UIStoryboardSegue.h"/>
- </class>
<class className="YelpMapViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/YelpMapViewController.h"/>
<relationships>
- <relationship kind="action" name="backToYelpMapView:" candidateClass="UIStoryboardSegue"/>
<relationship kind="action" name="largePhotoTapped:"/>
<relationship kind="outlet" name="photoViewerUIImageView" candidateClass="UIImageView"/>
<relationship kind="outlet" name="yelpMapView" candidateClass="MKMapView"/>
@@ -506,7 +618,7 @@
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="IAP-L1-hhl"/>
<segue reference="grn-P3-leO"/>
+ <segue reference="Th0-2G-EcE"/>
</inferredMetricsTieBreakers>
</document>
Please sign in to comment.
Something went wrong with that request. Please try again.