Permalink
Browse files

Before downloading the working version at 7:13PM

  • Loading branch information...
1 parent 378a0a6 commit 060c14c7706b42ad34cba6ba784f1e039239af1d @xirianlight xirianlight committed Mar 21, 2013
@@ -19,6 +19,7 @@
83B0D00A16FA1A8900C9D8F8 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B0D00916FA1A8900C9D8F8 /* HistoryViewController.m */; };
83BB6B6B16FA0A31003A4506 /* circleMask6464.png in Resources */ = {isa = PBXBuildFile; fileRef = 83BB6B6A16FA0A31003A4506 /* circleMask6464.png */; };
83BB6B6E16FA0A64003A4506 /* circleMask6464@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83BB6B6D16FA0A64003A4506 /* circleMask6464@2x.png */; };
+ 83E3AE9016FA687A00A8F27E /* webviewpopout_shelf@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83E3AE8F16FA687A00A8F27E /* webviewpopout_shelf@2x.png */; };
83FE37E216F76CD6000C9935 /* FlickrMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83FE37E116F76CD6000C9935 /* FlickrMapViewController.m */; };
8F372B0416F244C800302B80 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F372B0316F244C800302B80 /* UIKit.framework */; };
8F372B0616F244C800302B80 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F372B0516F244C800302B80 /* Foundation.framework */; };
@@ -86,6 +87,7 @@
83BB6B6A16FA0A31003A4506 /* circleMask6464.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = circleMask6464.png; sourceTree = "<group>"; };
83BB6B6D16FA0A64003A4506 /* circleMask6464@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "circleMask6464@2x.png"; sourceTree = "<group>"; };
83BB6B6F16FA0B1A003A4506 /* RossScratchpad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RossScratchpad.h; sourceTree = "<group>"; };
+ 83E3AE8F16FA687A00A8F27E /* webviewpopout_shelf@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "webviewpopout_shelf@2x.png"; sourceTree = "<group>"; };
83FE37E016F76CD6000C9935 /* FlickrMapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlickrMapViewController.h; sourceTree = "<group>"; };
83FE37E116F76CD6000C9935 /* FlickrMapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FlickrMapViewController.m; sourceTree = "<group>"; };
8F372B0016F244C800302B80 /* MappingMashupApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MappingMashupApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -276,6 +278,7 @@
8F3AD83816F90A0300BEEB3A /* Custom Images */ = {
isa = PBXGroup;
children = (
+ 83E3AE8F16FA687A00A8F27E /* webviewpopout_shelf@2x.png */,
83235E2B16FA27F80066659B /* webViewPopOut@2x.png */,
83BB6B6D16FA0A64003A4506 /* circleMask6464@2x.png */,
83BB6B6A16FA0A31003A4506 /* circleMask6464.png */,
@@ -392,6 +395,7 @@
83BB6B6B16FA0A31003A4506 /* circleMask6464.png in Resources */,
83BB6B6E16FA0A64003A4506 /* circleMask6464@2x.png in Resources */,
83235E2C16FA27F80066659B /* webViewPopOut@2x.png in Resources */,
+ 83E3AE9016FA687A00A8F27E /* webviewpopout_shelf@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -85,7 +85,7 @@ - (void)searchYelpAndSendToDelegates
NSArray *yelpBusinessesArray = [jsonDictionary valueForKey:@"businesses"];
[self createVenuesArray:yelpBusinessesArray];
- [[self delegate] didReceiveYelpData:yelpVenuesArray];
+ [self.delegate didReceiveYelpData:yelpVenuesArray];
//NSLog(@"%@", yelpBusinessesArray);
@@ -17,9 +17,12 @@
{
CLLocationManager *missLocationManager;
}
+-(void)didReceiveYelpData: (NSMutableArray*)venuesArray;
@property (strong, nonatomic) NSManagedObjectContext *managedObjectContext;
+
+
- (void)locationManager:(CLLocationManager *)manager
didUpdateToLocation:(CLLocation *)newLocation
fromLocation:(CLLocation *)oldLocation;
@@ -36,6 +36,7 @@ - (void)viewDidLoad
{
[super viewDidLoad];
+
//God help us, please make the location services work! Puh_LEASE JESUS
[self startLocationUpdates];
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12C60" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="mW4-IJ-E2e">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12D78" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="mW4-IJ-E2e">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
</dependencies>
@@ -70,7 +70,6 @@
<webView contentMode="scaleToFill" id="tBs-TS-l6k">
<rect key="frame" x="0.0" y="0.0" width="320" height="455"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
<gestureRecognizers/>
<connections>
<outlet property="delegate" destination="qVE-kj-ncM" id="c7l-wu-QlU"/>
@@ -82,7 +81,7 @@
<rect key="frame" x="0.0" y="408" width="320" height="47"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO" alpha="0.75" contentMode="scaleToFill" image="webViewPopOut@2x.png" id="07p-dX-8kh">
+ <imageView userInteractionEnabled="NO" alpha="0.75" contentMode="scaleToFill" image="webviewpopout_shelf@2x.png" id="07p-dX-8kh">
<rect key="frame" x="0.0" y="0.0" width="320" height="47"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
@@ -94,7 +93,7 @@
<nil key="highlightedColor"/>
</label>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -252,7 +251,7 @@
</objects>
<point key="canvasLocation" x="768" y="734"/>
</scene>
- <!--Tab Bar Controller - Bookmarks-->
+ <!--Tab Bar Controller-->
<scene sceneID="oO3-Hi-Sd7">
<objects>
<tabBarController definesPresentationContext="YES" id="jTz-JW-Bre" sceneMemberID="viewController">
@@ -274,14 +273,44 @@
</scene>
</scenes>
<resources>
- <image name="webViewPopOut@2x.png" width="640" height="94"/>
+ <image name="webviewpopout_shelf@2x.png" width="640" height="94"/>
</resources>
+ <classes>
+ <class className="BookmarksViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/BookmarksViewController.h"/>
+ </class>
+ <class className="FlickrMapViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/FlickrMapViewController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="mapView" candidateClass="MKMapView"/>
+ </relationships>
+ </class>
+ <class className="HistoryViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/HistoryViewController.h"/>
+ </class>
+ <class className="YelpMapViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/YelpMapViewController.h"/>
+ <relationships>
+ <relationship kind="outlet" name="mapView" candidateClass="MKMapView"/>
+ </relationships>
+ </class>
+ <class className="YelpWebPageBrowser" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/YelpWebPageBrowser.h"/>
+ <relationships>
+ <relationship kind="action" name="swipeLeftAction:"/>
+ <relationship kind="action" name="swipeRightAction:"/>
+ <relationship kind="outlet" name="popoutView" candidateClass="UIView"/>
+ <relationship kind="outlet" name="popoutViewTextLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="webView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
+ </classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
- <segue reference="n39-9o-eUd"/>
+ <segue reference="2lD-vN-oPh"/>
</inferredMetricsTieBreakers>
</document>
View
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 060c14c

Please sign in to comment.