Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Embeded entire project in NavController

  • Loading branch information...
commit 3aa14ed92fd931403b93c2e9b8792db586926193 1 parent a4eac87
@xirianlight xirianlight authored
View
8 MappingMashupApp.xcodeproj/project.pbxproj
@@ -10,10 +10,10 @@
6B2D7B2A16F8FE2B00E6D3A5 /* Photo.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B2D7B2916F8FE2B00E6D3A5 /* Photo.m */; };
6B2D7B2D16F8FE2B00E6D3A5 /* Business.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B2D7B2C16F8FE2B00E6D3A5 /* Business.m */; };
830729D416F766D6000F0037 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 830729D216F766D6000F0037 /* Model.xcdatamodeld */; };
+ 83332D2316F90F460085BDB6 /* wifiIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 83332D2216F90F460085BDB6 /* wifiIcon@2x.png */; };
8335571616F6D27600DB17D5 /* YelpWebPageBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 8335571516F6D27600DB17D5 /* YelpWebPageBrowser.m */; };
8335571916F754C800DB17D5 /* xmark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8335571816F754C800DB17D5 /* xmark.png */; };
8335571D16F7579600DB17D5 /* wifiIcon2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8335571C16F7579600DB17D5 /* wifiIcon2@2x.png */; };
- 8335571F16F759B600DB17D5 /* wifiIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8335571E16F759B600DB17D5 /* wifiIcon@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 */; };
@@ -68,11 +68,11 @@
6B2D7B2B16F8FE2B00E6D3A5 /* Business.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Business.h; path = ../Business.h; sourceTree = "<group>"; };
6B2D7B2C16F8FE2B00E6D3A5 /* Business.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Business.m; path = ../Business.m; sourceTree = "<group>"; };
830729D316F766D6000F0037 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
+ 83332D2216F90F460085BDB6 /* wifiIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wifiIcon@2x.png"; sourceTree = "<group>"; };
8335571416F6D27600DB17D5 /* YelpWebPageBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YelpWebPageBrowser.h; sourceTree = "<group>"; };
8335571516F6D27600DB17D5 /* YelpWebPageBrowser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YelpWebPageBrowser.m; sourceTree = "<group>"; };
8335571816F754C800DB17D5 /* xmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = xmark.png; sourceTree = "<group>"; };
8335571C16F7579600DB17D5 /* wifiIcon2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wifiIcon2@2x.png"; sourceTree = "<group>"; };
- 8335571E16F759B600DB17D5 /* wifiIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wifiIcon@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; };
@@ -251,7 +251,7 @@
8F3AD83816F90A0300BEEB3A /* Custom Images */ = {
isa = PBXGroup;
children = (
- 8335571E16F759B600DB17D5 /* wifiIcon@2x.png */,
+ 83332D2216F90F460085BDB6 /* wifiIcon@2x.png */,
8335571816F754C800DB17D5 /* xmark.png */,
);
name = "Custom Images";
@@ -359,7 +359,7 @@
8F372B1D16F244C800302B80 /* MainStoryboard.storyboard in Resources */,
8335571916F754C800DB17D5 /* xmark.png in Resources */,
8335571D16F7579600DB17D5 /* wifiIcon2@2x.png in Resources */,
- 8335571F16F759B600DB17D5 /* wifiIcon@2x.png in Resources */,
+ 83332D2316F90F460085BDB6 /* wifiIcon@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
3  MappingMashupApp/FlickrMapViewController.m
@@ -56,7 +56,8 @@ - (void)viewDidLoad
venuesArray = [yelpAPIManager searchYelpParseResults];
[self addPinsToMap];
-}
+
+ }
# pragma mark - User Location Methods
// deprecated: fix later
View
67 MappingMashupApp/en.lproj/MainStoryboard.storyboard
@@ -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="12D78" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="L5I-mE-d7D">
+<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>
@@ -9,7 +9,7 @@
<objects>
<viewController id="2" customClass="YelpMapViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="3">
- <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" id="fse-RH-zXz">
@@ -23,23 +23,23 @@
</view>
<connections>
<outlet property="mapView" destination="fse-RH-zXz" id="k6e-25-lWJ"/>
- <segue destination="qVE-kj-ncM" kind="modal" identifier="toYelpWebPage" id="grn-P3-leO"/>
+ <segue destination="qVE-kj-ncM" kind="push" identifier="toYelpWebPage" id="grn-P3-leO"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="381" y="25"/>
+ <point key="canvasLocation" x="907" y="25"/>
</scene>
<!--Flickr Map View Controller-->
<scene sceneID="5rQ-JE-I32">
<objects>
<viewController id="L5I-mE-d7D" customClass="FlickrMapViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="4th-y3-qBh">
- <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" showsUserLocation="YES" id="7uf-B3-ybP">
- <rect key="frame" x="0.0" y="0.0" width="320" height="548"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<connections>
<outlet property="delegate" destination="L5I-mE-d7D" id="xGQ-az-UrA"/>
@@ -48,25 +48,26 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
+ <navigationItem key="navigationItem" id="EnG-07-VoI"/>
<connections>
<outlet property="mapView" destination="7uf-B3-ybP" id="qbj-0f-eqs"/>
- <segue destination="2" kind="modal" identifier="toYelpMapView" id="yxN-ze-z9q"/>
+ <segue destination="2" kind="push" identifier="toYelpMapView" id="yxN-ze-z9q"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="2LJ-cg-2TS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="14" y="25"/>
+ <point key="canvasLocation" x="540" y="25"/>
</scene>
<!--Yelp Web Page Browser-->
<scene sceneID="5PQ-wp-x5Z">
<objects>
<viewController id="qVE-kj-ncM" customClass="YelpWebPageBrowser" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="wEa-dC-5Et">
- <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<webView contentMode="scaleToFill" id="tBs-TS-l6k">
- <rect key="frame" x="0.0" y="0.0" width="320" height="516"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="472"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
<connections>
@@ -74,7 +75,7 @@
</connections>
</webView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="v2A-LT-eS2">
- <rect key="frame" x="287" y="517" width="32" height="32"/>
+ <rect key="frame" x="288" y="472" width="32" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" title="Back" image="xmark.png">
@@ -89,7 +90,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="HQQ-5s-oQU">
- <rect key="frame" x="6" y="521" width="45" height="24"/>
+ <rect key="frame" x="6" y="476" width="45" height="24"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" title="&lt;">
@@ -101,7 +102,7 @@
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="qhF-Zb-E9u">
- <rect key="frame" x="51" y="522" width="45" height="23"/>
+ <rect key="frame" x="51" y="476.5" width="45" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" title=">">
@@ -122,12 +123,50 @@
<placeholder placeholderIdentifier="IBFirstResponder" id="UfP-Tc-Lc4" userLabel="First Responder" sceneMemberID="firstResponder"/>
<exit id="5YE-ke-7F9" userLabel="Exit" sceneMemberID="exit"/>
</objects>
- <point key="canvasLocation" x="851" y="82"/>
+ <point key="canvasLocation" x="1341" y="25"/>
+ </scene>
+ <!--Navigation Controller-->
+ <scene sceneID="nsR-uc-uMK">
+ <objects>
+ <navigationController id="mW4-IJ-E2e" sceneMemberID="viewController">
+ <toolbarItems/>
+ <navigationBar key="navigationBar" contentMode="scaleToFill" id="aIl-25-8SU">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </navigationBar>
+ <nil name="viewControllers"/>
+ <connections>
+ <segue destination="L5I-mE-d7D" kind="relationship" relationship="rootViewController" id="1KI-Rf-TkK"/>
+ </connections>
+ </navigationController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="Sld-eB-lJE" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="108" y="25"/>
</scene>
</scenes>
<resources>
<image name="xmark.png" width="64" height="64"/>
</resources>
+ <classes>
+ <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="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="outlet" name="webView" candidateClass="UIWebView"/>
+ </relationships>
+ </class>
+ </classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
View
BIN  wifiIcon@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.