Permalink
Browse files

more final ui work, added peanuts, cleaning up more stuff.

  • Loading branch information...
1 parent eedfd4c commit 8feaa32f4237203789107faeffeb46dfe8bc7f2f @xirianlight xirianlight committed Mar 27, 2013
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -29,6 +29,11 @@
836B861D1702479600B593A4 /* addBookmarkButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 836B861C1702479600B593A4 /* addBookmarkButton@2x.png */; };
836B862317024F1700B593A4 /* addBookmarkC@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 836B862217024F1700B593A4 /* addBookmarkC@2x.png */; };
837D9F1F1701F56700565291 /* appIcon114x114.png in Resources */ = {isa = PBXBuildFile; fileRef = 837D9F1E1701F56700565291 /* appIcon114x114.png */; };
+ 838961501703914700CC86B9 /* DavidFinalLarge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8389614C1703914700CC86B9 /* DavidFinalLarge@2x.png */; };
+ 838961511703914700CC86B9 /* EmilyFinalLarge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8389614D1703914700CC86B9 /* EmilyFinalLarge@2x.png */; };
+ 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 */; };
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 */; };
@@ -114,6 +119,11 @@
836B861C1702479600B593A4 /* addBookmarkButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "addBookmarkButton@2x.png"; path = "MappingMashupApp/addBookmarkButton@2x.png"; sourceTree = "<group>"; };
836B862217024F1700B593A4 /* addBookmarkC@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "addBookmarkC@2x.png"; path = "MappingMashupApp/addBookmarkC@2x.png"; sourceTree = "<group>"; };
837D9F1E1701F56700565291 /* appIcon114x114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = appIcon114x114.png; sourceTree = "<group>"; };
+ 8389614C1703914700CC86B9 /* DavidFinalLarge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DavidFinalLarge@2x.png"; sourceTree = "<group>"; };
+ 8389614D1703914700CC86B9 /* EmilyFinalLarge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EmilyFinalLarge@2x.png"; sourceTree = "<group>"; };
+ 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>"; };
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>"; };
@@ -327,6 +337,11 @@
8F3AD83816F90A0300BEEB3A /* Custom Images */ = {
isa = PBXGroup;
children = (
+ 838961561703AECF00CC86B9 /* wiWhere512@2x.png */,
+ 8389614C1703914700CC86B9 /* DavidFinalLarge@2x.png */,
+ 8389614D1703914700CC86B9 /* EmilyFinalLarge@2x.png */,
+ 8389614E1703914700CC86B9 /* PaulFinalLarge@2x.png */,
+ 8389614F1703914700CC86B9 /* RossFinalLarge@2x.png */,
6B66DA1117034B30001CC055 /* closeButton@2x.png */,
835CB1AF1702558B009190FA /* forwardArrow@2x.png */,
835CB1AD17025521009190FA /* backArrow@2x.png */,
@@ -487,6 +502,11 @@
835CB1AE17025521009190FA /* backArrow@2x.png in Resources */,
835CB1B01702558B009190FA /* forwardArrow@2x.png in Resources */,
6B66DA1217034B30001CC055 /* closeButton@2x.png in Resources */,
+ 838961501703914700CC86B9 /* DavidFinalLarge@2x.png in Resources */,
+ 838961511703914700CC86B9 /* EmilyFinalLarge@2x.png in Resources */,
+ 838961521703914700CC86B9 /* PaulFinalLarge@2x.png in Resources */,
+ 838961531703914700CC86B9 /* RossFinalLarge@2x.png in Resources */,
+ 838961571703AECF00CC86B9 /* wiWhere512@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -39,8 +39,12 @@ @interface FlickrMapViewController ()
BOOL isZoomedInYet;
__weak IBOutlet UIImageView *photoViewerUIImageView;
BOOL didSelectThumbnail;
+ __weak IBOutlet UILabel *bioLabel;
+ __weak IBOutlet UIScrollView *bioScrollView;
+
}
- (IBAction)fullSizedPhotoTapped:(id)sender;
+- (IBAction)infoButtonPressed:(id)sender;
- (IBAction)closePhotoButtonPressed:(id)sender;
@@ -68,6 +72,9 @@ - (void)viewDidLoad
// NSDate *future = [NSDate dateWithTimeIntervalSinceNow: 3];
// [NSThread sleepUntilDate:future];
+ //Code for bio page
+ bioScrollView.contentSize = bioLabel.frame.size;
+
//Add refresh button to Bookmarks viewController --CURRENTLY GOES TO BOOKMARKS, NEED TO WRITE METHOD FOR THIS
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(refreshButtonPressed)];
@@ -481,6 +488,9 @@ - (IBAction)fullSizedPhotoTapped:(id)sender
[self performSegueWithIdentifier:@"toYelpMapView" sender:nil];
}
+- (IBAction)infoButtonPressed:(id)sender {
+}
+
- (IBAction)closePhotoButtonPressed:(id)sender
{
if (didSelectThumbnail == YES) {
@@ -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>
@@ -65,12 +65,57 @@
<outlet property="delegate" destination="L5I-mE-d7D" id="xGQ-az-UrA"/>
</connections>
</mapView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoDark" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="WIM-HQ-xLH">
+ <rect key="frame" x="291" y="465.5" width="18" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal">
+ <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="infoButtonPressed:" destination="L5I-mE-d7D" eventType="touchUpInside" id="Bir-9c-G7K"/>
+ </connections>
+ </button>
+ <view contentMode="scaleToFill" id="QIi-SX-ZAA">
+ <rect key="frame" x="0.0" y="-64" width="325" height="568"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="silverBG@2x.png" id="D5k-eU-WtS">
+ <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="331" 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 for free." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GWX-UP-W0P">
+ <rect key="frame" x="20" y="232" 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"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="mapShadow@2x.png" id="uCm-qi-JQe">
+ <rect key="frame" x="-6" y="535" width="331" height="50"/>
+ <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"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ </imageView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="mapShadowTop@2x.png" id="sq9-B6-zeb">
<rect key="frame" x="0.0" y="-25" width="320" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<view contentMode="scaleToFill" id="OOa-i0-nDV">
- <rect key="frame" x="10" y="-185" width="300" height="185"/>
+ <rect key="frame" x="10" y="-184.5" width="300" height="185"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" id="O4r-WJ-Sly">
@@ -79,7 +124,7 @@
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="l7g-9r-gcH">
- <rect key="frame" x="274" y="-5" width="31" height="31"/>
+ <rect key="frame" x="268.5" y="-2.5" width="34" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="closeButton@2x.png">
@@ -111,36 +156,6 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
- <view contentMode="scaleToFill" id="QIi-SX-ZAA">
- <rect key="frame" x="0.0" y="-64" width="325" height="568"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="silverBG@2x.png" id="D5k-eU-WtS">
- <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="331" 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 for free." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GWX-UP-W0P">
- <rect key="frame" x="20" y="232" 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"/>
- <nil key="highlightedColor"/>
- </label>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="mapShadow@2x.png" id="uCm-qi-JQe">
- <rect key="frame" x="-6" y="535" width="331" height="50"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- </imageView>
- <imageView userInteractionEnabled="NO" contentMode="center" image="appIcon@2x.png" id="veT-vc-0vB">
- <rect key="frame" x="103" y="113" width="119" height="131"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- </imageView>
- </subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
- </view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
@@ -397,14 +412,14 @@
</scene>
</scenes>
<resources>
- <image name="appIcon@2x.png" width="114" height="114"/>
<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"/>
<image name="mapShadow@2x.png" width="640" height="100"/>
<image name="mapShadowTop@2x.png" width="640" height="100"/>
<image name="silverBG@2x.png" width="640" height="1136"/>
<image name="webviewpopout_shelf@2x.png" width="640" height="94"/>
+ <image name="wiWhere512@2x.png" width="512" height="512"/>
<image name="yelpMapViewShader@2x.png" width="640" height="390"/>
</resources>
<classes>
@@ -419,6 +434,9 @@
<relationships>
<relationship kind="action" name="closePhotoButtonPressed:"/>
<relationship kind="action" name="fullSizedPhotoTapped:"/>
+ <relationship kind="action" name="infoButtonPressed:"/>
+ <relationship kind="outlet" name="bioLabel" candidateClass="UILabel"/>
+ <relationship kind="outlet" name="bioScrollView" candidateClass="UIScrollView"/>
<relationship kind="outlet" name="enlargedPhotoViewOutlet" candidateClass="UIView"/>
<relationship kind="outlet" name="loadingOverlay" candidateClass="UIView"/>
<relationship kind="outlet" name="mapView" candidateClass="MKMapView"/>
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 8feaa32

Please sign in to comment.