Permalink
Browse files

Re-added initial pause to confirm location services has enough time t…

…o run
  • Loading branch information...
1 parent debd090 commit ed28b3e0ed83901b606f35b9d10fb4bb38d3ef7a @xirianlight xirianlight committed Mar 25, 2013
Showing with 52 additions and 10 deletions.
  1. +2 −1 MappingMashupApp/FlickrMapViewController.m
  2. +50 −9 MappingMashupApp/en.lproj/MainStoryboard.storyboard
@@ -67,7 +67,8 @@ - (void)viewDidLoad
//Add bookmarks button to viewController
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemBookmarks target:self action:@selector(bookmarkButtonPressed)];
-
+ NSDate *future = [NSDate dateWithTimeIntervalSinceNow: 2 ];
+ [NSThread sleepUntilDate:future];
//Created method "bookmarkButtonPressed, currently has no action - End edit
// Core Data
@@ -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>
@@ -52,15 +52,15 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="loadingPage.png" id="D5k-eU-WtS">
- <rect key="frame" x="0.0" y="51.5" width="320" height="568"/>
+ <rect key="frame" x="0.0" y="52" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" animating="YES" style="whiteLarge" id="BDR-6h-3HL">
<rect key="frame" x="144" y="362" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</activityIndicatorView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Experience your surroundings. Tap something interesting and we'll show you where you can get online" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GWX-UP-W0P">
- <rect key="frame" x="20" y="429" width="285" height="91"/>
+ <rect key="frame" x="20" y="407" width="285" height="91"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -89,11 +89,11 @@
<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="64" width="320" height="455"/>
+ <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="455"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<gestureRecognizers/>
<connections>
@@ -103,15 +103,15 @@
</connections>
</webView>
<view contentMode="scaleToFill" id="JIq-gF-FaR">
- <rect key="frame" x="0.0" y="462" width="320" height="47"/>
+ <rect key="frame" x="0.0" y="462" width="320" height="96"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="webviewpopout_shelf@2x.png" id="07p-dX-8kh">
- <rect key="frame" x="0.0" y="0.0" width="320" height="47"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="96"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Swipe to go forward or back" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="emB-3U-nsG">
- <rect key="frame" x="20" y="13" width="280" height="21"/>
+ <rect key="frame" x="20" y="38" width="280" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -307,13 +307,54 @@
<image name="loadingPage.png" width="640" height="1136"/>
<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"/>
+ <relationships>
+ <relationship kind="outlet" name="tableViewOutlet" candidateClass="UITableView"/>
+ </relationships>
+ </class>
+ <class className="FlickrMapViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/FlickrMapViewController.h"/>
+ <relationships>
+ <relationship kind="action" name="backToFlickrMapView:" candidateClass="UIStoryboardSegue"/>
+ <relationship kind="outlet" name="loadingOverlay" candidateClass="UIView"/>
+ <relationship kind="outlet" name="mapView" candidateClass="MKMapView"/>
+ </relationships>
+ </class>
+ <class className="HistoryViewController" superclassName="UIViewController">
+ <source key="sourceIdentifier" type="project" relativePath="./Classes/HistoryViewController.h"/>
+ <relationships>
+ <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="outlet" name="yelpMapView" 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="Th0-2G-EcE"/>
- <segue reference="2lD-vN-oPh"/>
+ <segue reference="grn-P3-leO"/>
</inferredMetricsTieBreakers>
</document>

0 comments on commit ed28b3e

Please sign in to comment.