Permalink
Browse files

fixed info button and about us text

  • Loading branch information...
1 parent da8b8f2 commit 077935495662c831f7583e7f8fefa8109119e2a8 @bitey bitey committed Apr 10, 2013
View
8 MappingMashupApp.xcodeproj/project.pbxproj
@@ -174,7 +174,7 @@
B40B477416F68FC1006BD4CE /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
B425500716F6B158005CCC9E /* Venue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Venue.h; path = ../Venue.h; sourceTree = "<group>"; };
B425500816F6B158005CCC9E /* Venue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Venue.m; path = ../Venue.m; sourceTree = "<group>"; };
- B448609317135FB400054C35 /* poweredBy@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "poweredBy@2x.png"; sourceTree = "<group>"; };
+ B448609317135FB400054C35 /* poweredBy@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "poweredBy@2x.png"; path = "MappingMashupApp/poweredBy@2x.png"; sourceTree = "<group>"; };
B482103E16FFE579004EE1CF /* UIView+AnimationTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+AnimationTools.h"; sourceTree = "<group>"; };
B482103F16FFE579004EE1CF /* UIView+AnimationTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+AnimationTools.m"; sourceTree = "<group>"; };
B4E072AD17148AA1008350D2 /* wiwhere57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wiwhere57.png; sourceTree = "<group>"; };
@@ -214,8 +214,6 @@
8F372AF716F244C800302B80 = {
isa = PBXGroup;
children = (
- B4E072B017148AA5008350D2 /* appIconwMMLogo114.png */,
- B4E072AD17148AA1008350D2 /* wiwhere57.png */,
8F372B0916F244C800302B80 /* MappingMashupApp */,
8F372B0216F244C800302B80 /* Frameworks */,
8F372B0116F244C800302B80 /* Products */,
@@ -262,7 +260,6 @@
8F372B0A16F244C800302B80 /* Supporting Files */ = {
isa = PBXGroup;
children = (
- B448609317135FB400054C35 /* poweredBy@2x.png */,
6B6EB7BA17039FD500B66CA9 /* Default.png */,
6B6EB7BB17039FD500B66CA9 /* Default@2x.png */,
6B6EB7BF1703A1F600B66CA9 /* Default-568h@2x.png */,
@@ -340,6 +337,9 @@
8F3AD83816F90A0300BEEB3A /* Custom Images */ = {
isa = PBXGroup;
children = (
+ B448609317135FB400054C35 /* poweredBy@2x.png */,
+ B4E072B017148AA5008350D2 /* appIconwMMLogo114.png */,
+ B4E072AD17148AA1008350D2 /* wiwhere57.png */,
838961561703AECF00CC86B9 /* wiWhere512@2x.png */,
8389614C1703914700CC86B9 /* DavidFinalLarge@2x.png */,
8389614D1703914700CC86B9 /* EmilyFinalLarge@2x.png */,
View
15 MappingMashupApp/FlickrMapViewController.m
@@ -29,7 +29,7 @@ @interface FlickrMapViewController ()
float longitudeToPass;
NSString * photoTitleToPass;
NSString * photoThumbnailStringToPass;
-
+ __weak IBOutlet UIButton *infoButtonOutlet;
__weak IBOutlet UIButton *photoOverlayButton;
__weak IBOutlet UIView *enlargedPhotoViewOutlet;
@@ -68,18 +68,25 @@ - (void)viewDidLoad
missLocationManager.delegate = self;
[missLocationManager startUpdatingLocation];
+ //
+ //Getting the size of the screen for image placement
+ //
float screenWidth = self.view.frame.size.width;
float screenHeight = self.view.frame.size.height;
-
UIImageView *powered = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"poweredBy.png"]];
-
float poweredImageWidth = powered.frame.size.width;
float poweredImageHeight = powered.frame.size.height;
-
powered.frame = CGRectMake(screenWidth - poweredImageWidth, screenHeight - poweredImageHeight, poweredImageWidth, poweredImageHeight);
[self.view addSubview:powered];
+ float infoButtonWidth = infoButtonOutlet.frame.size.width;
+ float infoButtonHeight = infoButtonOutlet.frame.size.width;
+ float infoButtonPositionX = powered.center.x - (infoButtonWidth/2);
+ float infoButtonPositionY = ((screenHeight - poweredImageHeight)-infoButtonHeight) - (screenHeight * 0.005);
+
+ infoButtonOutlet.frame = CGRectMake(infoButtonPositionX, infoButtonPositionY, infoButtonWidth, infoButtonHeight);
+
//Code for bio page
bioScrollView.contentSize = bioLabel.frame.size;
View
8 MappingMashupApp/en.lproj/MainStoryboard.storyboard
@@ -81,7 +81,7 @@
<rect key="frame" x="20" y="137" width="280" height="347"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
- <string 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.</string>
+ <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 free 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>
@@ -239,7 +239,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoDark" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="WIM-HQ-xLH" userLabel="Info Button">
- <rect key="frame" x="291" y="465.5" width="18" height="19"/>
+ <rect key="frame" x="291" y="465" width="18" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal">
@@ -294,6 +294,7 @@
<navigationItem key="navigationItem" title="Wi-Where" id="UUg-sh-XIb"/>
<connections>
<outlet property="enlargedPhotoViewOutlet" destination="OOa-i0-nDV" id="xe8-AJ-DKV"/>
+ <outlet property="infoButtonOutlet" destination="WIM-HQ-xLH" id="qwD-jq-WKy"/>
<outlet property="loadingOverlay" destination="QIi-SX-ZAA" id="TsT-yj-EFc"/>
<outlet property="mapView" destination="7uf-B3-ybP" id="qbj-0f-eqs"/>
<outlet property="photoOverlayButton" destination="kbm-YI-FPA" id="UoZ-m1-l3E"/>
@@ -589,6 +590,7 @@
<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="infoButtonOutlet" candidateClass="UIButton"/>
<relationship kind="outlet" name="loadingOverlay" candidateClass="UIView"/>
<relationship kind="outlet" name="mapView" candidateClass="MKMapView"/>
<relationship kind="outlet" name="photoOverlayButton" candidateClass="UIButton"/>
@@ -629,7 +631,7 @@
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
+ <segue reference="Th0-2G-EcE"/>
<segue reference="grn-P3-leO"/>
- <segue reference="IAP-L1-hhl"/>
</inferredMetricsTieBreakers>
</document>

0 comments on commit 0779354

Please sign in to comment.